From c3dc3cb2d21d96b3b3116a84afbd98395e6e36fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 19 Apr 2022 13:57:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayWorkingGroupSubItemController.java     | 4 +++-
 .../service/impl/PayWorkingGroupSubItemServiceImpl.java  | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

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 799a4b2d..01ce0d0c 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
@@ -369,6 +369,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(CollectionUtils.isEmpty(listPayContactsManagementTemporary)){
 			 return Result.error("联系人不存在!");
 		 }
+		 // todo 联系人关联表
 		 listPayWorkingGroupSubItem.forEach(p->{
 			 List<PayContactsManagementTemporary> listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdOne(),item.getId())).collect(Collectors.toList());
 			 if(CollectionUtils.isEmpty(listContactsInfo)){
@@ -510,7 +511,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 }
 		 // Step.1 组装查询条件
 		 QueryWrapper<PayWorkingGroupSubItem> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubItem, request.getParameterMap());
-
+		 // todo 联系人关联表
 		 // Step.2 获取导出数据
 		 List<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.list(queryWrapper);
 		 List<PayWorkingGroupSubItem> exportList;
@@ -597,6 +598,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if (excelData.isEmpty()) {
 			 throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
 		 }
+		 // todo 联系人关联表
 		 payWorkingGroupSubItemService.importExcel(request);
 		 return Result.OK("文件导入成功！");
 	 }
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 45730a59..57fa1274 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
@@ -767,6 +767,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         }
         deleteProject(id,"workingGroupMember:delete");
         payWorkingGroupSubItemService.removeById(id);
+        // 删除成员企业联系人
+        LambdaUpdateWrapper<PayWorkingGroupSubItemContacts> updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>();
+        updatePayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,id);
+        payWorkingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts);
     }
 
     @Override
@@ -783,6 +787,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             deleteProject(s1,"workingGroupMember:batchDel");
         }
         payWorkingGroupSubItemService.removeByIds(Arrays.asList(ids.split(",")));
+        // 删除成员企业联系人
+        LambdaUpdateWrapper<PayWorkingGroupSubItemContacts> updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>();
+        updatePayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,Arrays.asList(ids.split(",")));
+        payWorkingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts);
     }
 
     @Override
@@ -815,6 +823,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         }
         List<PayWorkingGroupSubItem> list = payWorkingGroupSubItemService.listByIds(Arrays.asList(s));
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // todo 联系人关联表
         List<String> listMsg = new ArrayList<>();
         if(!CollectionUtils.isEmpty(list)){
             List<String> listContacts = new ArrayList<>();