ext 提交文件

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;
+}

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;
+}

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;
     }