From 95229a29dfe3249f2b3f5f3f65db400012425c94 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 25 Mar 2024 10:14:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082892=20=E5=B7=A5=E4=BD=9C=E7=BB=84--?=
 =?UTF-8?q?=E8=B0=83=E8=B4=A6=E7=94=9F=E6=88=90=E7=9A=84=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E5=BE=85=E7=A1=AE=E6=94=B6=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E6=B2=A1=E6=9C=89=E5=8F=98=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemController.java         |  3 +--
 .../service/IPayWorkingGroupSubItemService.java   |  5 +++--
 .../impl/PayWorkingGroupSubItemServiceImpl.java   | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 771a2254..95c2df80 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -623,8 +623,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 public Result<?> editAccount(@RequestParam(name = "workGroupId") String workGroupId,
 								  @RequestParam(name = "companyId") String companyId,
 								  @RequestParam(name = "id") String id) {
-		 payWorkingGroupSubItemService.delete(id);
-		 payWorkingGroupSubItemService.editAccount(workGroupId, companyId);
+		 payWorkingGroupSubItemService.editAccount(workGroupId, companyId, id);
 		 return Result.OK("调账成功!");
 	 }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java
index f4374d11..8b67317f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java
@@ -141,7 +141,8 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
      * 调账
      *
      * @param workGroupId 工作组id
-     * @param companyId  成员单位id
+     * @param companyId   成员单位id
+     * @param id
      */
-    void editAccount(String workGroupId, String companyId);
+    void editAccount(String workGroupId, String companyId, String id);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index 955dbc7a..449589bc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.api.vo.Result;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.dto.PaySendContactsMessageDTO;
 import com.jero.common.dto.SendMessageDTO;
@@ -1240,7 +1239,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
     }
 
     @Override
-    public void editAccount(String workGroupId, String companyId) {
+    public void editAccount(String workGroupId, String companyId, String id) {
+        if (StringUtils.isBlank(id)) {
+            throw new JeroBootException("id不能为空!");
+        }
+        deleteProject(id, "workingGroupMember:delete");
+
         // 获取对应成员单位数据
         PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId);
         if (Objects.isNull(payWorkingGroup)){
@@ -1308,6 +1312,13 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         // 备注
         payCommonProject.setRemarks(data.getRemarks());
         payCommonProjectService.addPayCommonProject(payCommonProject);
+
+        // 删除
+        payWorkingGroupSubItemService.removeById(id);
+        // 删除成员企业联系人
+        LambdaUpdateWrapper<PayWorkingGroupSubItemContacts> updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>();
+        updatePayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, id);
+        payWorkingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts);
     }
 
     /**