From 6660fd483800c1560fde1b8b6791476a458e27b3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 14:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=94=E6=9D=91=E7=A7=BB=E9=99=A4=E6=8E=89?= =?UTF-8?q?=E5=85=9A=E6=80=BB=E6=94=AF=20=E5=B9=B6=E7=BB=99=E5=AD=94?= =?UTF-8?q?=E6=9D=91=E9=95=87=20=E9=99=8D=E7=BA=A7=E4=B8=BA=E8=A1=97?= =?UTF-8?q?=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/impl/AgencyServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 6f191c2fc5..170ca1c811 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -50,10 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; /** * 组织相关api @@ -536,14 +533,21 @@ public class AgencyServiceImpl implements AgencyService { } while (true); //多客户 获取所有下级 List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); - //孔村降级处理 + //孔村降级处理 且移除掉 党总支级别 String KONG_CUN_AGENCY_ID = "1234085031077498881"; - agencyNodeDTOS.forEach(e->{ + Iterator iterator = agencyNodeDTOS.iterator(); + while (iterator.hasNext()){ + ScreenCustomerAgencyDTO e = iterator.next(); if (e.getPids().contains(KONG_CUN_AGENCY_ID)){ - e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel())); + if (OrgLevelEnum.STREET.getCode().equals(e.getLevel())){ + iterator.remove(); + } + if (KONG_CUN_AGENCY_ID.equals(e.getAgencyId())){ + e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel())); + } } convertOrgTreeNode(nodeList, e); - }); + } nodes = TreeUtils.buildTreeByAreaCode(nodeList); } //只有一个根节点的树 所以返回一个