From d383d27838638637509ea6b8edb7fac2663cdafd Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 15:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=88=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...atformProjectCertificationInventoryEOServiceImpl.java | 5 +++++
 .../impl/PlatformProjectLawsInventoryEOServiceImpl.java  | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
index a568a77b3..31f23a177 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
@@ -4991,6 +4991,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
 				value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
 				if(StringUtils.isNotBlank(value)){
 					projectCertificationInventoryEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
+
 				}
 			}
 			//工程接口人(责任领域下的工程接口人)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 2cc8f60b9..902dcf898 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -5592,6 +5592,15 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory, "责任领域", "Responsible Field");
 			if (flag) {
 				value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory, msgList, "责任领域", "Responsible Field", DicCodeEnum.DUTY_TERRITORY.getCode());
+
+				if(StringUtils.isNotBlank(value)){
+					projectLawsInventoryEO.setDutyTerritory(value);
+					List<String> list = Arrays.asList(value.split(","));
+					List<SysDictItem> ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList());
+					List<String> valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList());
+					projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,","));
+				}
+
 				if (StringUtils.isNotBlank(value)) {
 					//工程接口人(责任领域下的工程接口人)
 					Map<String, Object> objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);