From 2a20d01b90367b4a77af6bd0f44bd4f196f08e68 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 30 Mar 2021 13:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AE=A9=E7=BB=84=E6=8E=A5=E5=8F=A3v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/dto/member/form/ConfirmTransferFormDTO.java  |  4 +++-
 .../GroupLeaderTransferRecordController.java           |  1 +
 .../impl/GroupLeaderTransferRecordServiceImpl.java     | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ConfirmTransferFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ConfirmTransferFormDTO.java
index 9bda15a783..3fd80cd64c 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ConfirmTransferFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ConfirmTransferFormDTO.java
@@ -24,7 +24,9 @@ public class ConfirmTransferFormDTO implements Serializable {
     @NotBlank(message = "type不能为空:自主转让resi，工作人员转让gov")
     private String type;
 
+    /**************************以上是需要前端传入的参数*******************************************************/
     @NotBlank(message = "tokenDto中获取customerId为空")
     private String customerId;
-
+    @NotBlank(message = "tokenDto中获取userId为空")
+    private String currentUserId;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/GroupLeaderTransferRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/GroupLeaderTransferRecordController.java
index 55d18521f5..98376bb68e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/GroupLeaderTransferRecordController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/GroupLeaderTransferRecordController.java
@@ -53,6 +53,7 @@ public class GroupLeaderTransferRecordController {
     @PostMapping("confirmtransfer")
     public Result confirmTransfer(@LoginUser TokenDto tokenDto, @RequestBody ConfirmTransferFormDTO formDTO){
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setCurrentUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO);
         groupLeaderTransferRecordService.confirmTransfer(formDTO);
         return new Result();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
index 6134be2cf2..7b4564a41d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java
@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dto.form.UserMessageFormDTO;
@@ -128,6 +130,14 @@ public class GroupLeaderTransferRecordServiceImpl extends BaseServiceImpl<GroupL
     public void confirmTransfer(ConfirmTransferFormDTO formDTO) {
         //原组长
         ResiGroupMemberDTO originalLeader = resiGroupMemberService.getGroupLeader(formDTO.getGroupId());
+        //如果是居民端转让组，只能是当前组长操作
+        if (ModuleConstant.APP_RESI.equals(formDTO.getType())) {
+            //当前用户如果不是组长，不允许提交
+            if (!originalLeader.getCustomerUserId().equals(formDTO.getCurrentUserId())) {
+                //只有组长才可以操作
+                throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode(),EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg());
+            }
+        }
         originalLeader.setGroupLeaderFlag(LeaderFlagConstant.GROUP_MEMBER);
         resiGroupMemberService.update(originalLeader);