From e11f8476603f9b1c1aac6339b48543b45a51ef1d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 21 Oct 2020 14:46:56 +0800 Subject: [PATCH] =?UTF-8?q?treebytype=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/constant/ScreenConstant.java | 2 ++ .../screen/impl/AgencyServiceImpl.java | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java index 96005bfcc3..5ea0aa7cbf 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java @@ -16,6 +16,8 @@ public interface ScreenConstant { String COMMA = ","; + String COLON = ":"; + String MONTH_ID = "month"; String YEAR_ID = "year"; 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 9da23db2e6..e53a9eb10e 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 @@ -129,10 +129,10 @@ public class AgencyServiceImpl implements AgencyService { sub.setChildren(treeResultDTOS); }else { List subAgency = new ArrayList<>(); - if (sub.getPids().contains(",")){ - subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue()); + if (sub.getPids().contains(ScreenConstant.COMMA)){ + subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COMMA + sub.getValue()); }else { - subAgency = getDepartmentList(sub.getPids() + ":" + sub.getValue()); + subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COLON + sub.getValue()); } sub.setChildren(subAgency); } @@ -156,10 +156,10 @@ public class AgencyServiceImpl implements AgencyService { sub.setChildren(treeResultDTOS); }else { List subAgency = new ArrayList<>(); - if (sub.getPids().contains(",")){ - subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue()); + if (sub.getPids().contains(ScreenConstant.COMMA)){ + subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COMMA + sub.getValue()); }else { - subAgency = getDepartmentList(sub.getPids() + ":" + sub.getValue()); + subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COLON + sub.getValue()); } sub.setChildren(subAgency); }