From ca46aed30739be09fbbdb413ff7d2f843934efda Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十一月 2024 09:26:27 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java
index acf2c66..9436d99 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/RegionTreeVO.java
@@ -42,13 +42,25 @@
for (PageRegionInfoResponse treeNode : nodeList){
// 鍒ゆ柇褰撳墠鑺傜偣鏄惁涓烘牴鑺傜偣锛屾澶勬敞鎰忥細鑻arentId绫诲瀷鏄疭tring锛屽垯瑕侀噰鐢╡quals()鏂规硶鍒ゆ柇銆�
if (Objects.isNull(treeNode.getParentIndexCode())
- || StringUtils.equals(treeNode.getParentIndexCode(),"null")) {
+ || StringUtils.equals(treeNode.getParentIndexCode(),"null")
+ || !isValidParentCode(treeNode.getParentIndexCode(),nodeList)) {
// 鏄紝娣诲姞
rootNodeList.add(treeNode);
}
}
return rootNodeList;
+ }
+
+ private boolean isValidParentCode(String parentIndexCode, List<PageRegionInfoResponse> nodeList) {
+ for (PageRegionInfoResponse treeNode : nodeList){
+ // 鍒ゆ柇褰撳墠鑺傜偣鏄惁涓烘牴鑺傜偣锛屾澶勬敞鎰忥細鑻arentId绫诲瀷鏄疭tring锛屽垯瑕侀噰鐢╡quals()鏂规硶鍒ゆ柇銆�
+ if ( StringUtils.equals(treeNode.getIndexCode(),parentIndexCode)) {
+ return true;
+ }
+
+ }
+ return false;
}
@@ -59,7 +71,7 @@
public List<PageRegionInfoResponse> buildTree(){
// treeNodes锛氫繚瀛樹竴涓《绾ц妭鐐规墍鏋勫缓鍑烘潵鐨勫畬鏁存爲褰�
List<PageRegionInfoResponse> treeNodes = new ArrayList<PageRegionInfoResponse>();
- // getRootNode()锛氳幏鍙栨墍鏈夌殑鏍硅妭鐐�
+ getRootNode();//锛氳幏鍙栨墍鏈夌殑鏍硅妭鐐�
for (PageRegionInfoResponse treeRootNode : getRootNode()) {
// 灏嗛《绾ц妭鐐硅繘琛屾瀯寤哄瓙鏍�
treeRootNode = buildChildTree(treeRootNode);
@@ -79,7 +91,7 @@
// nodeList锛氭墍鏈夎妭鐐归泦鍚堬紙鎵�鏈夋暟鎹級
for (PageRegionInfoResponse treeNode : nodeList) {
// 鍒ゆ柇褰撳墠鑺傜偣鐨勭埗鑺傜偣ID鏄惁绛変簬鏍硅妭鐐圭殑ID锛屽嵆褰撳墠鑺傜偣涓哄叾涓嬬殑瀛愯妭鐐�
- if (!Objects.isNull(treeNode.getParentIndexCode())&&treeNode.getParentIndexCode().equals(pNode.getRegionIndexCode())) {
+ if (!Objects.isNull(treeNode.getParentIndexCode())&&treeNode.getParentIndexCode().equals(pNode.getIndexCode())) {
// 鍐嶉�掑綊杩涜鍒ゆ柇褰撳墠鑺傜偣鐨勬儏鍐碉紝璋冪敤鑷韩鏂规硶
childTree.add(buildChildTree(treeNode));
}
--
Gitblit v1.9.3