From 1d9b07a87f835d46edf191f2b0cbf98481ee15f5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 15:02:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E4=B8=AA=E6=97=A5=E5=BF=97=E8=81=94?= =?UTF-8?q?=E8=B0=83=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/AgencyServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 170ca1c811..041f5e7bfd 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 @@ -505,7 +505,7 @@ public class AgencyServiceImpl implements AgencyService { //todo 暂不处理 有时间再说 }else { ScreenCustomerAgencyDTO parentAgencyDTO = null; - String subAgencyAreaCode = staffAgencyDTO.getParentAreaCode(); + String parentAreaCode = staffAgencyDTO.getParentAreaCode(); List nodeList = new ArrayList<>(); /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); @@ -521,7 +521,7 @@ public class AgencyServiceImpl implements AgencyService { convertOrgTreeNode(nodeList, currentAgency);*/ //多客户 获取所有直线上级 do { - parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(subAgencyAreaCode); + parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(parentAreaCode); if (parentAgencyDTO == null){ break; } @@ -529,8 +529,9 @@ public class AgencyServiceImpl implements AgencyService { if (parentAgencyDTO.getPid() == null || NumConstant.ZERO_STR.equals(parentAgencyDTO.getPid())){ break; } - subAgencyAreaCode = parentAgencyDTO.getAreaCode(); + parentAreaCode = parentAgencyDTO.getAreaCode(); } while (true); + log.debug("查询所有上级为:{}",JSON.toJSONString(nodeList)); //多客户 获取所有下级 List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); //孔村降级处理 且移除掉 党总支级别 @@ -550,6 +551,7 @@ public class AgencyServiceImpl implements AgencyService { } nodes = TreeUtils.buildTreeByAreaCode(nodeList); } + log.debug("查询所有上级树结构为:{}",JSON.toJSONString(nodes)); //只有一个根节点的树 所以返回一个 return nodes.get(0); }