From 0b34c2051025c4c7533fb5b3788634d1437f3965 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 23 Aug 2022 13:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E8=B0=83?=
 =?UTF-8?q?=E5=8F=96=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=97=B6,?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E4=B8=BA?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=9A=84=E8=AF=9D,=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E4=B8=BA=E5=A4=9A=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 1013b4130..419b6efb8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -236,11 +236,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			LambdaQueryWrapper<DummyInventoryInfoEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,projectLawsInventoryEO.getDummyInventoryBaseId());
 			List<DummyInventoryInfoEO> dummyInventoryInfoEOList = dummyInventoryInfoEOService.list(lambdaQueryWrapper);
+			List<DummyInventoryInfoEO> dummyInventoryInfoEOListNew  = new ArrayList<>();
 			if(dummyInventoryInfoEOList.size() != 0){
 				List<ProjectLawsInventoryEO> projectLawsInventoryEOS = new ArrayList<>();
 				if(projectLawsInventoryEOList.size() ==0){
-					//此时法规清单中没有数据,直接将维护清单中的数据添加即可
+					//责任领域如果有多个,则需要拆分成多条
 					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
+						String dutyTerritory = dummyInventoryInfoEO.getDutyTerritory();
+						if(StringUtils.isNotBlank(dutyTerritory)){
+							for (String dutyTerritoryOne : dutyTerritory.split(",")) {
+								DummyInventoryInfoEO dummyInventoryInfoEONew = new DummyInventoryInfoEO();
+								BeanUtils.copyProperties(dummyInventoryInfoEO,dummyInventoryInfoEONew);
+								dummyInventoryInfoEONew.setDutyTerritory(dutyTerritoryOne);
+								dummyInventoryInfoEOListNew.add(dummyInventoryInfoEONew);
+							}
+						}else{
+							dummyInventoryInfoEOListNew.add(dummyInventoryInfoEO);
+						}
+					}
+
+					//此时法规清单中没有数据,直接将维护清单中的数据添加即可
+					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
 						ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
 						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
 						BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp);
@@ -253,7 +269,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}else{
 					//此时法规清单中有数据,再添加虚拟清单数据时,如果法规清单中已有要填加的虚拟清单数据,则数据以法规清单为准
 					List<ProjectLawsInventoryEO> projectLawsInventoryEOListTemp = new ArrayList<>();
-					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
+					for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
 						List<ProjectLawsInventoryEO> collect = projectLawsInventoryEOList.stream()
 								.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList());
 						if(collect.size() != 0){