From f816d8d341f8191ae9514390b2e14b2b7c4ffc35 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 3 Feb 2021 20:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9/epmet/ext/staff/permission?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BF=94=E5=8F=82=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?customerId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/ExtDeptResultDTO.java    |  5 +++++
 .../java/com/epmet/dto/result/ExtGridResultDTO.java    |  5 +++++
 .../epmet/dto/result/ExtStaffPermissionResultDTO.java  |  5 +++++
 .../src/main/resources/mapper/CustomerAgencyDao.xml    | 10 ++++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtDeptResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtDeptResultDTO.java
index 4b0d67ca35..d0e4558346 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtDeptResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtDeptResultDTO.java
@@ -23,4 +23,9 @@ public class ExtDeptResultDTO implements Serializable {
      * 部门名称
      * */
     private String deptName;
+
+    /**
+     * 当前deptId所属的customerId  add02.03
+     * */
+    private String customerId;
 }
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
index 018c298c50..90641f29d4 100644
--- 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
@@ -23,4 +23,9 @@ public class ExtGridResultDTO implements Serializable {
      * 网格名称
      * */
     private String gridName;
+
+    /**
+     * 当前gridId所属的客户id add02.03
+     * */
+    private String customerId;
 }
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
index 9aa4c9b982..fbaf784c25 100644
--- 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
@@ -45,4 +45,9 @@ public class ExtStaffPermissionResultDTO implements Serializable {
      * 子集机关列表
      * */
     private List<ExtStaffPermissionResultDTO> subAgencyList = new ArrayList<>();
+
+    /**
+     * 当前agencyId所属的客户id add02.03
+     * */
+    private String customerId;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 665fcba28f..5286846214 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -208,14 +208,17 @@
         <id column="agencyId" property="agencyId" />
         <result column="agencyName" property="agencyName"/>
         <result column="level" property="level" />
+        <result column="customerId" property="customerId"/>
         <collection property="gridList" ofType="com.epmet.dto.result.ExtGridResultDTO">
             <id column="gridId" property="gridId" />
             <result column="gridName" property="gridName" />
+            <result column="customerId" property="customerId"/>
         </collection>
 
         <collection property="departmentList" column="agencyId" ofType="com.epmet.dto.result.ExtDeptResultDTO" select="selectDeptList">
             <id column="deptId" property="deptId" />
             <result column="deptName" property="deptName" />
+            <result column="customerId" property="customerId"/>
         </collection>
 
         <collection property="subAgencyList" column="agencyId"
@@ -240,8 +243,10 @@
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
+            agency.CUSTOMER_ID as customerId,
             grid.ID AS gridId,
-            grid.GRID_NAME AS gridName
+            grid.GRID_NAME AS gridName,
+            grid.CUSTOMER_ID as customerId
         FROM
             CUSTOMER_AGENCY agency
             LEFT JOIN CUSTOMER_GRID grid ON agency.ID = grid.PID
@@ -254,7 +259,8 @@
     <select id="selectDeptList" resultType="com.epmet.dto.result.ExtDeptResultDTO">
         SELECT
             ID AS deptId,
-            DEPARTMENT_NAME AS deptName
+            DEPARTMENT_NAME AS deptName,
+            CUSTOMER_ID as customerId
         FROM
             CUSTOMER_DEPARTMENT dept
         WHERE