From 1189550a91ae7bf830b6b66775b756d999143359 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 7 Mar 2024 13:58:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B5=B7=E8=8D=89=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/PayDraftingGroupSubItemController.java      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
index c8bec5bf..06a385ff 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
@@ -23,6 +23,7 @@ import com.jero.drafting.vo.CheckVo;
 import com.jero.drafting.vo.PayDraftingGroupSubItemExcel;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.project.entity.PayWorkingGroupSubItemContacts;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import io.swagger.annotations.Api;
@@ -33,6 +34,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;
 
@@ -240,6 +242,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
     @RequiresPermissions("draftingGroupMember:batchAdd")
     @ApiOperation(value = "起草组成员-批量添加", notes = "起草组成员-批量添加")
     @PostMapping(value = "/batchAdd")
+    @Transactional(rollbackFor = Exception.class)
     public Result<?> batchAdd(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) {
         String draftingGroupIds = payDraftingGroupSubItem.getDraftingGroupIds();
         if (StringUtils.isBlank(draftingGroupIds)) {
@@ -247,6 +250,10 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
         }
         String[] draftingGroupIdsArr = draftingGroupIds.split(",");
         for (String draftingGroupId : draftingGroupIdsArr) {
+            payDraftingGroupSubItem.setId(null);
+            List<PayDraftingGroupSubItemContacts> payDraftingGroupSubItemContacts =
+                    payDraftingGroupSubItem.getPayDraftingGroupSubItemContactsList();
+            payDraftingGroupSubItemContacts.forEach(p-> p.setId(null));
             payDraftingGroupSubItem.setDraftingGroupId(draftingGroupId);
             StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem);
             if (!StringUtils.isBlank(msg)) {