From eba00a4d1cfae5b3e95d8ffb8c84a75c0f2bd6ce Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 21 Oct 2020 14:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E7=A4=BE=E5=8C=BA=E7=9A=84tr?=
 =?UTF-8?q?ee?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/screen/AgencyController.java     |  7 +++++++
 .../evaluationindex/screen/AgencyService.java   |  7 +++++++
 .../screen/impl/AgencyServiceImpl.java          | 17 +++++++++++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
index accd1e6e2e..0b978ce9b0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
+++ b/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));
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
index bb39b8ebc3..7e07abbcf2 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
+++ b/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);
 
     /**
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 e53a9eb10e..ac4befa559 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
@@ -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);
                 }