From 4bcbaa33542a0d70be3824c23dcbff98b7b19b92 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Wed, 10 May 2023 10:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=80=E7=BA=A7=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?=
 =?UTF-8?q?=EF=BC=88=E7=BB=9F=E8=AE=A1=E8=8A=82=E7=82=B9=EF=BC=89=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectLawsInventoryEO.java        |  4 ++++
 .../ProjectLawsInventoryEOServiceImpl.java    | 23 +++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index f739e73aa..045b3a717 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -530,4 +530,8 @@ public class ProjectLawsInventoryEO implements Serializable {
     /**流程类型展示名称*/
     @TableField(exist = false)
     private String flowTypeName;
+
+    /**一级责任领域**/
+    @TableField(exist = false)
+    private String firstLevelDutyTerritory;
 }
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 863fdbb95..38ac9efbf 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
@@ -40,6 +40,7 @@ import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
 import com.jero.modules.dummy.service.impl.DummyInventoryBaseEOServiceImpl;
 import com.jero.modules.dummy.util.DeepCopyListUtil;
 import com.jero.modules.dummy.util.ListDiff;
+import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.feishu.enums.TemplateInfoEnum2;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.feishu.vo.FeishuMsg2Vo;
@@ -13398,16 +13399,30 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	@Override
 	public IPage<ProjectLawsInventoryEO> queryPage(ProjectLawsInventoryEO projectLawsInventoryEO, Integer pageNo, Integer pageSize, HttpServletRequest req) {
-		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
-		queryWrapper.orderByDesc("create_time","serial_number");
-
 		String dutyTerritoryStr = "";
 		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDutyTerritory())) {
 			dutyTerritoryStr = projectLawsInventoryEO.getDutyTerritory();
 			projectLawsInventoryEO.setDutyTerritory(null);
 		}
 
-		String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId();
+		// 根据一级责任领域（统计节点），查询该一级责任领域下所有子责任领域的法规清单数据。
+		if(StringUtils.isNotEmpty(projectLawsInventoryEO.getFirstLevelDutyTerritory())){
+			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
+			List<SysDictItem> dutyTerritorys = new ArrayList<>();
+			Map<String, List<SysDictItem>> firstLevelDTMap = this.sysDictItemServiceImpl.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(), sysDictItems);
+			String[] firstLevelDTArr = projectLawsInventoryEO.getFirstLevelDutyTerritory().split(",");
+			for (String firstLevelDT : firstLevelDTArr){
+				if(CollectionUtils.isNotEmpty(firstLevelDTMap.get(firstLevelDT))){
+					dutyTerritorys.addAll(firstLevelDTMap.get(firstLevelDT));
+				}
+			}
+			if(CollectionUtils.isNotEmpty(dutyTerritorys)){
+				dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(","));
+			}
+		}
+
+		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time","serial_number");
 
 		if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
 			String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*","");