From 5ece313ab5545f0a220b5c9ff8891996d1a8c91c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 7 Mar 2024 11:45:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3Id=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayWorkingGroupSubItemController.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 83f991b7..743f9d8c 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
@@ -52,6 +52,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -428,6 +429,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 @RequiresPermissions("workingGroupMember:batchAdd")
 	 @ApiOperation(value = "工作组成员-批量添加", notes = "工作组成员-批量添加")
 	 @PostMapping(value = "/batchAdd")
+	 @Transactional(rollbackFor = Exception.class)
 	 public Result<?> batchAdd(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) {
 		 String workingGroupIds = payWorkingGroupSubItem.getWorkingGroupIds();
 		 if (StringUtils.isBlank(workingGroupIds)) {
@@ -435,10 +437,12 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 }
 		 String[] workingGroupIdsArr = workingGroupIds.split(",");
 		 for (String workingGroupId : workingGroupIdsArr) {
-			 if (StringUtils.isBlank(workingGroupId)) {
-				 return Result.error("工作组id不能为空！");
-			 }
+			 payWorkingGroupSubItem.setId(null);
+			 List<PayWorkingGroupSubItemContacts> payWorkingGroupSubItemContactsList =
+					 payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList();
+			 payWorkingGroupSubItemContactsList.forEach(p-> p.setId(null));
 			 payWorkingGroupSubItem.setWorkingGroupId(workingGroupId);
+			 payWorkingGroupService.validAndSetDefaultValue(payWorkingGroupSubItem);
 			 StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem);
 			 if (!StringUtils.isBlank(msg)) {
 				 return Result.error(msg.toString());