From 8bb88ec2ed80687858d0aa9f53b78f407f4045dd Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 25 三月 2026 10:26:30 +0800
Subject: [PATCH] gis树桩菜单修复
---
fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
index 7860820..48e673a 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
@@ -21,6 +21,7 @@
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Description
@@ -54,6 +55,10 @@
@Resource
private PledgeContractService pledgeContractService;
+
+
+ @Resource
+ private PledgeContractDepotService pledgeContractDepotService;
/**
* 鑾峰彇鐪佸強涓嬪睘甯傚窞闆嗗悎
@@ -150,7 +155,15 @@
for (Dept dept : depotList) {
Boolean isPledge = false;
for (PledgeContract pledgeContract : pledgeContractList) {
- if( dept.getId().equals(pledgeContract.getPledgeDept())){
+ IgdsBaseParam param = new IgdsBaseParam();
+ param.setParentId(pledgeContract.getId());
+ List<PledgeContractDepot> pledgeContractDepots = pledgeContractDepotService.listAll(param);
+ if (null == pledgeContractDepots || pledgeContractDepots.isEmpty()){
+ continue;
+ }
+ //鎵惧埌pledgeContractDepots涓殑deptId闆嗗悎锛屽苟鍘婚噸
+ List<String> deptIdList = pledgeContractDepots.stream().map(PledgeContractDepot::getPledgeDept).distinct().collect(Collectors.toList());
+ if( deptIdList.contains(dept.getId())){
//浠巐ist涓壘鍒板綋鍓嶈川鎶奸摱琛岀殑鏁版嵁
DicArea pledgeBank = null;
int indexBank = -1;
@@ -201,11 +214,9 @@
areaChildren.set(indexBank,pledgeBank);
isPledge=true;
break;
-
}
-
-
}
+
}
if(!isPledge){
DicArea deptDic = new DicArea();
--
Gitblit v1.9.3