From 84fae44a1e52884c762fc796b5a8c65819cf18cc Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 3 Nov 2020 16:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=98=BF=E9=87=8C=E4=BA=91?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupServiceImpl.java    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index e1121d6c9d..f237d4ae7c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -364,7 +364,13 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			logger.info(String.format("创建小组异常:%s",EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg()));
 			throw new RenException(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode());
 		}
-		//2.1、查询当前申请人的身份，生成对应格式的消息内容
+
+		//2.内容检查
+		scanGroupEditContent(applyCreateGroupFormDTO.getGroupName(),
+				applyCreateGroupFormDTO.getGroupIntroduction(),
+				applyCreateGroupFormDTO.getGroupHeadPhoto());
+
+		//3.1、查询当前申请人的身份，生成对应格式的消息内容
         UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyCreateGroupFormDTO.getApp(),
                 applyCreateGroupFormDTO.getUserId(),
                 applyCreateGroupFormDTO.getCustomerId(),
@@ -379,10 +385,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
         }else if(NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())){
             roleName = ModuleConstant.WAREMHEARTED_RESI;
         }
-		//2.2、插入一条待审核的组信息
+
+		//3.2、插入一条待审核的组信息
 		ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO);
 		insert(resiGroupEntity);
-		//3.获取居民注册信息
+		//4.获取居民注册信息
         UserResiInfoFormDTO resiParam = new UserResiInfoFormDTO();
         resiParam.setCustomerId(applyCreateGroupFormDTO.getCustomerId());
         resiParam.setUserId(applyCreateGroupFormDTO.getUserId());
@@ -395,7 +402,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
         }
 		userName = StringUtils.isBlank(userName) ? ModuleConstant.UNKNOWN : userName;
         String msg = String.format(UserMessageConstant.CREATION_OF_GROUP_MESSAGE_TEMPLATE,roleName,userName,applyCreateGroupFormDTO.getGroupName());
-		//3.2、插入一条待审核的操作记录
+		//4.2、插入一条待审核的操作记录
 		ResiGroupOperationDTO resiGroupOperation = new ResiGroupOperationDTO();
 		resiGroupOperation.setResiGroupId(resiGroupEntity.getId());
 		resiGroupOperation.setState(GroupStateConstant.GROUP_UNDER_AUDITTING);
@@ -403,7 +410,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupOperation.setMessageText(msg);
 		resiGroupOperation.setReadFlag(ModuleConstant.UNREAD);
 		resiGroupOperationService.save(resiGroupOperation);
-		//4、插入一群成员信息（群主）
+		//5、插入一群成员信息（群主）
 		ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
 		resiGroupMemberDTO.setCustomerUserId(applyCreateGroupFormDTO.getUserId());
 		resiGroupMemberDTO.setResiGroupId(resiGroupEntity.getId());
@@ -411,7 +418,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupMemberDTO.setStatus(MemberStateConstant.UNDER_AUDITTING);
 		resiGroupMemberDTO.setEnterGroupType(EnterGroupTypeConstant.CREATED);
 		resiGroupMemberService.save(resiGroupMemberDTO);
-		//5、插入一条入群记录（群主的）
+		//6、插入一条入群记录（群主的）
 		GroupMemeberOperationDTO groupMemeberOperationDTO = new GroupMemeberOperationDTO();
 		groupMemeberOperationDTO.setCustomerUserId(applyCreateGroupFormDTO.getUserId());
 		groupMemeberOperationDTO.setGroupId(resiGroupEntity.getId());
@@ -419,7 +426,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		groupMemeberOperationDTO.setOperateUserId(applyCreateGroupFormDTO.getUserId());
 		groupMemeberOperationDTO.setEnterGroupType(EnterGroupTypeConstant.CREATED);
 		groupMemeberOperationService.save(groupMemeberOperationDTO);
-		//6、群初始统计记录
+		//7、群初始统计记录
 		/*UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyCreateGroupFormDTO.getApp(),
 				applyCreateGroupFormDTO.getUserId(),
 				applyCreateGroupFormDTO.getCustomerId(),