From cd6f50a9dede851c708f8284a9ff871b7550007d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sat, 14 Nov 2020 13:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E6=8F=90=E4=BA=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BA=BA=E6=98=AF=E5=90=A6=E6=98=AF=E7=BB=84=E9=95=BF=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=BB=84=E9=95=BF=E6=89=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/controller/ResiGroupController.java    | 4 ++--
 .../epmet/modules/group/service/ResiGroupService.java    | 2 +-
 .../modules/group/service/impl/ResiGroupServiceImpl.java | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
index a32e44626b..8f6620be9d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
@@ -378,9 +378,9 @@ public class ResiGroupController {
      * @return
      */
     @PostMapping("submit-edit")
-    public Result submitGroupEdit(@RequestBody EditGroupFormDTO form){
+    public Result submitGroupEdit(@RequestBody EditGroupFormDTO form, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(form, EditGroupFormDTO.SubmitGroupEditVG.class);
-        resiGroupService.submitGroupEdit(form.getGroupId(), form.getGroupName(), form.getGroupHeadPhoto(), form.getGroupIntroduction());
+        resiGroupService.submitGroupEdit(form.getGroupId(), form.getGroupName(), form.getGroupHeadPhoto(), form.getGroupIntroduction(), tokenDto.getUserId());
         return new Result();
     }
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
index 43bbca9b1b..b17f2c7cf1 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
@@ -296,7 +296,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 
 	GroupDetailResultDTO getGroupDetail(String groupId);
 
-	void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction);
+	void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId);
 
 	/**
 	 * @Description 工作端 查询组变更待审核列表
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 2e8ee1216b..39acacad26 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
@@ -1061,13 +1061,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	}
 
 	@Override
-	public void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction) {
+	public void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId) {
 		// 1.判断小组是否存在，判断是否已经在"待审核"状态
 		ResiGroupEntity group = resiGroupDao.selectById(groupId);
 		if (group == null) {
 			throw new RenException(EpmetErrorCode.GROUP_NOT_EXISTS.getCode(), EpmetErrorCode.GROUP_NOT_EXISTS.getMsg());
 		}
 
+		// 判断是否是组长
+		ResiGroupMemberDTO groupLeader = resiGroupMemberDao.selectLeaderMember(groupId);
+		if (groupLeader == null || !groupLeader.getCustomerUserId().equals(editUserId)) {
+			String msg = "只有该组的组长才可以编辑组信息";
+			throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), msg, msg, RenException.MessageMode.CODE_INTERNAL_EXTERNAL);
+		}
+
 		// 2.判断是否可以提交编辑
 		GroupEditSubmitRecordEntity lre = groupEditSubmitRecordDao.getLatestEditSubmitRecord(groupId);
 		if (lre != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(lre.getAuditStatus())) {