From c2f209fc8522ba5ad80a2535ea3fd261228d18c0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 22 Dec 2021 11:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/AgencyListResultDTO.java  | 5 ++++-
 .../java/com/epmet/dto/result/DepartmentListResultDTO.java   | 4 ++++
 .../java/com/epmet/dto/result/GridBaseInfoResultDTO.java     | 5 ++++-
 .../src/main/resources/mapper/CustomerAgencyDao.xml          | 1 +
 .../src/main/resources/mapper/CustomerDepartmentDao.xml      | 1 +
 .../src/main/resources/mapper/CustomerGridDao.xml            | 1 +
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java
index edfe5e60d5..bb959e6a38 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java
@@ -46,6 +46,10 @@ public class AgencyListResultDTO implements Serializable {
      * 总人数
      */
     private Integer totalUser;
+    /**
+     * 编码
+     */
+    private String code;
     /**
      * 负责人
      */
@@ -55,5 +59,4 @@ public class AgencyListResultDTO implements Serializable {
      */
     private String mobile;
 
-
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java
index 8dde952e1c..e6aa5636bc 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java
@@ -46,6 +46,10 @@ public class DepartmentListResultDTO implements Serializable {
      * 部门下总人数
      */
     private Integer totalUser = 0;
+    /**
+     * 编码
+     */
+    private String code;
     /**
      * 负责人
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java
index 4adaf8b70f..88ec09e037 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java
@@ -29,7 +29,10 @@ public class GridBaseInfoResultDTO implements Serializable {
      * 网格人数
      * */
     private Integer totalUser;
-
+    /**
+     * 编码
+     */
+    private String code;
     /**
      * 负责人
      */
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 69e86b72d4..c75ad15069 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
@@ -124,6 +124,7 @@
             id AS 'agencyId',
             organization_name AS 'agencyName',
             total_user AS 'totalUser',
+            code 'code',
             contacts 'contacts',
 	        mobile 'mobile'
         FROM customer_agency
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
index ad8d075ca7..8ed7d3d378 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
@@ -24,6 +24,7 @@
             id AS 'departmentId',
             department_name AS 'departmentName',
             total_user AS 'totalUser',
+            code AS 'code',
             contacts AS 'contacts',
 	        mobile AS 'mobile'
         FROM customer_department
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 25e2349baa..f26695e6f8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -284,6 +284,7 @@
             id AS gridId,
             IFNULL(grid_name,"") AS gridName,
             total_user,
+            code,
             contacts,
             mobile
         FROM