From 5bddd701795450af16f3423e53b07d7c74475f4a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 7 Apr 2021 12:18:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/resi/group/constant/GroupStateConstant.java     | 2 ++
 .../resi/group/dto/group/form/ApplyCreateGroupFormDTO.java    | 4 ++++
 .../modules/group/service/impl/ResiGroupServiceImpl.java      | 1 +
 3 files changed, 7 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java
index ee3bcda420..6d93e5a010 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java
@@ -57,4 +57,6 @@ public interface GroupStateConstant {
 	 * 进组审核open开启；close关闭
 	 */
 	String AUDIT_SWITCH_CLOSED = "close";
+
+	String CLOSED="closed";
 }
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 fd2b239ea8..69efcf295c 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
@@ -65,4 +65,8 @@ public class ApplyCreateGroupFormDTO implements Serializable {
     @NotBlank(message = "app不能为空")
     private String app;
 
+    /**
+     * 小组是否允许参观:允许：open;不允许：closed
+     */
+    private String visitSwitch;
 }
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 4ee54bcd43..084c99afd9 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
@@ -517,6 +517,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupEntity.setGroupIntroduction(applyCreateGroupFormDTO.getGroupIntroduction());
 		resiGroupEntity.setCreatedBy(applyCreateGroupFormDTO.getUserId());
 		resiGroupEntity.setState(GroupStateConstant.GROUP_UNDER_AUDITTING);
+		resiGroupEntity.setVisitSwitch(StringUtils.isNotBlank(applyCreateGroupFormDTO.getVisitSwitch()) ? applyCreateGroupFormDTO.getVisitSwitch() : GroupStateConstant.CLOSED);
 		return resiGroupEntity;
 	}