Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java

@@ -46,11 +46,7 @@ public class AgencyServiceImpl implements AgencyService {
         if (null == rootAgency){
             return new TreeResultDTO();
         }
-        String sub = null;
-        if ("".equals(rootAgency.getPids()) || rootAgency.getPids().equals("0")){
-            sub = rootAgency.getValue();
-        }
-        List<TreeResultDTO> departmentList = this.getDepartmentList(sub);
+        List<TreeResultDTO> departmentList = this.getDepartmentList(("".equals(rootAgency.getPids()) || rootAgency.getPids().equals(NumConstant.ZERO_STR)) ? rootAgency.getValue():rootAgency.getPids().concat(",").concat(rootAgency.getValue()));
         rootAgency.setChildren(departmentList);
         return rootAgency;
     }