智慧社区的tree

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java

@@ -33,6 +33,13 @@ public class AgencyController {
         return new Result<TreeResultDTO>().ok(agencyService.tree(customerId));
     }
 
+    /**
+     * @Description  智慧社区的tree
+     * @Param customerId
+     * @Param bizType
+     * @author zxc
+     * @date 2020/10/21 2:49 下午
+     */
     @PostMapping("treebytype")
     public Result<TreeResultDTO> treeByType(@RequestHeader("CustomerId") String customerId,@RequestParam("bizType")String bizType){
         return new Result<TreeResultDTO>().ok(agencyService.treeByType(customerId,bizType));

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

@@ -20,6 +20,13 @@ public interface AgencyService {
      */
     TreeResultDTO tree(String customerId);
 
+    /**
+     * @Description  智慧社区的tree
+     * @Param customerId
+     * @Param bizType
+     * @author zxc
+     * @date 2020/10/21 2:49 下午
+     */
     TreeResultDTO treeByType(String customerId,String bizType);
 
     /**

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

@@ -66,6 +66,13 @@ public class AgencyServiceImpl implements AgencyService {
         return rootAgency;
     }
 
+    /**
+     * @Description  智慧社区的tree
+     * @Param customerId
+     * @Param bizType
+     * @author zxc
+     * @date 2020/10/21 2:49 下午
+     */
     @Override
     public TreeResultDTO treeByType(String customerId, String bizType) {
         TreeResultDTO rootAgency = null;
@@ -141,6 +148,12 @@ public class AgencyServiceImpl implements AgencyService {
         return subAgencyList;
     }
 
+    /**
+     * @Description  智慧社区的tree
+     * @Param subAgencyPids
+     * @author zxc
+     * @date 2020/10/21 2:49 下午
+     */
     public List<TreeResultDTO> getDepartmentListByBiz(String subAgencyPids) {
         List<TreeResultDTO> subAgencyList = screenCustomerAgencyDao.selectSubAgencyListByBizType(subAgencyPids);
         if (subAgencyList.size() > NumConstant.ZERO) {
@@ -157,9 +170,9 @@ public class AgencyServiceImpl implements AgencyService {
                 }else {
                     List<TreeResultDTO> subAgency = new ArrayList<>();
                     if (sub.getPids().contains(ScreenConstant.COMMA)){
-                         subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COMMA + sub.getValue());
+                         subAgency = getDepartmentListByBiz(sub.getPids() + ScreenConstant.COMMA + sub.getValue());
                     }else {
-                        subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COLON + sub.getValue());
+                        subAgency = getDepartmentListByBiz(sub.getPids() + ScreenConstant.COLON + sub.getValue());
                     }
                     sub.setChildren(subAgency);
                 }