treebytype接口添加

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

@@ -128,7 +128,12 @@ public class AgencyServiceImpl implements AgencyService {
                     });
                     sub.setChildren(treeResultDTOS);
                 }else {
-                    List<TreeResultDTO> subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue());
+                    List<TreeResultDTO> subAgency = new ArrayList<>();
+                    if (sub.getPids().contains(",")){
+                        subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue());
+                    }else {
+                        subAgency = getDepartmentList(sub.getPids() + ":" + sub.getValue());
+                    }
                     sub.setChildren(subAgency);
                 }
             });
@@ -150,7 +155,12 @@ public class AgencyServiceImpl implements AgencyService {
                     });
                     sub.setChildren(treeResultDTOS);
                 }else {
-                    List<TreeResultDTO> subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue());
+                    List<TreeResultDTO> subAgency = new ArrayList<>();
+                    if (sub.getPids().contains(",")){
+                         subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue());
+                    }else {
+                        subAgency = getDepartmentList(sub.getPids() + ":" + sub.getValue());
+                    }
                     sub.setChildren(subAgency);
                 }
             });

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -146,6 +146,7 @@
         WHERE
             ca.del_flag = '0'
             AND cbo.DEL_FLAG = 0
+            AND cbo.biz_type = "community"
             AND ca.IS_DISPLAY = '1'
             AND ca.pids = #{subAgencyPids}
         ORDER BY