From f963928a0e6dd214f6b5cae8ba4925f82e26659c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 17 Aug 2020 16:08:05 +0800
Subject: [PATCH] =?UTF-8?q?ext=20=E6=8F=90=E4=BA=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/ExtGridResultDTO.java    | 20 ++++++++++++++++
 .../result/ExtStaffPermissionResultDTO.java   | 23 +++++++++++++++++++
 .../impl/CustomerAgencyServiceImpl.java       |  8 +++++++
 3 files changed, 51 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java
new file mode 100644
index 0000000000..ed36458a9f
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName ExtGridResultDTO
+ * @Auth wangc
+ * @Date 2020-08-17 15:28
+ */
+@Data
+public class ExtGridResultDTO implements Serializable {
+    private static final long serialVersionUID = -4531574240525562587L;
+
+    private String gridId;
+
+    private String gridName;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java
new file mode 100644
index 0000000000..b74504ddcf
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @ClassName ExtStaffPermissionResultDTO
+ * @Auth wangc
+ * @Date 2020-08-17 15:24
+ */
+@Data
+public class ExtStaffPermissionResultDTO implements Serializable {
+    private static final long serialVersionUID = 2513553862809278219L;
+
+    private String agencyId;
+
+    private String agencyName;
+
+    private List<ExtGridResultDTO> gridList;
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index 344e947135..ba856bda8b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -860,6 +860,14 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             result.setCustomerName(customerResult.getData().getCustomerName());
         }
         checkFieldAndSetDefault(result);
+        result.setAdminFlag(NumConstant.ZERO_STR);
+        if(null != result.getRoleList() && !result.getRoleList().isEmpty()){
+            result.getRoleList().forEach(o -> {
+                if(StringUtils.equals("root_manager",o.getRoleKey())){
+                    result.setAdminFlag(NumConstant.ONE_STR);
+                }
+            });
+        }
         return result;
     }