From eed1afa908566d88a824cd482301a982cc2d1617 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 19 Apr 2021 15:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20groupType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/group/form/ApplyCreateGroupFormDTO.java | 6 ++++++
 .../com/epmet/modules/group/entity/ResiGroupEntity.java    | 5 +++++
 .../modules/group/service/impl/ResiGroupServiceImpl.java   | 7 ++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java
index 69efcf295c..fc14ffd2f5 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java
@@ -69,4 +69,10 @@ public class ApplyCreateGroupFormDTO implements Serializable {
      * 小组是否允许参观:允许：open;不允许：closed
      */
     private String visitSwitch;
+
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    @NotBlank(message = "小组类型不能为空")
+    private String groupType;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
index 1c80c117eb..147aed6717 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
@@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed
 	 */
 	private String visitSwitch;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }
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 26f1b8c746..4d5baf8b16 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
@@ -373,9 +373,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		}
 
 		//2.内容检查
-		scanGroupEditContent(applyCreateGroupFormDTO.getGroupName(),
-				applyCreateGroupFormDTO.getGroupIntroduction(),
-				applyCreateGroupFormDTO.getGroupHeadPhoto());
+//		scanGroupEditContent(applyCreateGroupFormDTO.getGroupName(),
+//				applyCreateGroupFormDTO.getGroupIntroduction(),
+//				applyCreateGroupFormDTO.getGroupHeadPhoto());
 
 		//3.1、查询当前申请人的身份，生成对应格式的消息内容
 		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyCreateGroupFormDTO.getApp(),
@@ -518,6 +518,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupEntity.setCreatedBy(applyCreateGroupFormDTO.getUserId());
 		resiGroupEntity.setState(GroupStateConstant.GROUP_UNDER_AUDITTING);
 		resiGroupEntity.setVisitSwitch(StringUtils.isNotBlank(applyCreateGroupFormDTO.getVisitSwitch()) ? applyCreateGroupFormDTO.getVisitSwitch() : GroupStateConstant.CLOSED);
+		resiGroupEntity.setGroupType(applyCreateGroupFormDTO.getGroupType());
 		return resiGroupEntity;
 	}