From 06f4e7634dfb0eea7aa5848217026ceff843b782 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Fri, 6 Nov 2020 16:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=88=86=E4=B8=BA=E4=B8=A4=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CustomerAgencyController.java  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 3d14c14ea7..3135924fdd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -43,6 +43,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -255,11 +256,25 @@ public class CustomerAgencyController {
      * @Author liushaowen
      * @Date 2020/11/6 13:51
      */
-    @PostMapping("getagencyelementtree")
-    public Result<AgencyElementTreeResultDTO> getAgencyElementTree(String customerId){
+    @PostMapping("getagencyelementtreelist")
+    public Result<List<AgencyElementTreeResultDTO.Agency>> getAgencyElementTreeList(String customerId){
         if (StringUtils.isBlank(customerId)){
             throw new RenException("customerId不能为空");
         }
-        return new Result<AgencyElementTreeResultDTO>().ok(customerAgencyService.getAgencyElementTree(customerId));
+        return new Result<List<AgencyElementTreeResultDTO.Agency>>().ok(customerAgencyService.getAgencyElementTree(customerId).getList());
+    }
+    /**
+     * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency keys
+     * @param customerId
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author liushaowen
+     * @Date 2020/11/6 13:51
+     */
+    @PostMapping("getagencyelementtreekeys")
+    public Result<Set<String>> getAgencyElementTreeKeys(String customerId){
+        if (StringUtils.isBlank(customerId)){
+            throw new RenException("customerId不能为空");
+        }
+        return new Result<Set<String>>().ok(customerAgencyService.getAgencyElementTree(customerId).getDefaultKeys());
     }
 }