From 6cbd391c5a2812469d3ad5f721643f5028ca1821 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 24 Aug 2020 17:48:21 +0800
Subject: [PATCH] =?UTF-8?q?ext=20staff=20permission=20=E5=A2=9E=E5=8A=A0le?=
 =?UTF-8?q?vel=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ExtStaffPermissionResultDTO.java    | 5 +++++
 .../src/main/resources/mapper/CustomerAgencyDao.xml          | 3 +++
 2 files changed, 8 insertions(+)

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 8408c42dbf..9aa4c9b982 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
@@ -26,6 +26,11 @@ public class ExtStaffPermissionResultDTO implements Serializable {
      * */
     private String agencyName;
 
+    /**
+     * 机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+     * */
+    private String level;
+
     /**
      * 直属机关直属网格列表
      * */
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 c2fb090e3f..3018846910 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
@@ -190,6 +190,7 @@
     <resultMap id="treeMap" type="com.epmet.dto.result.ExtStaffPermissionResultDTO">
         <id column="agencyId" property="agencyId" />
         <result column="agencyName" property="agencyName"/>
+        <result column="level" property="level" />
         <collection property="gridList" ofType="com.epmet.dto.result.ExtGridResultDTO">
             <id column="gridId" property="gridId" />
             <result column="gridName" property="gridName" />
@@ -221,6 +222,7 @@
         SELECT
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
+            agency.LEVEL AS level,
             grid.ID AS gridId,
             grid.GRID_NAME AS gridName
         FROM
@@ -247,6 +249,7 @@
         SELECT
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
+            agency.LEVEL AS level,
             grid.ID AS gridId,
             grid.GRID_NAME AS gridName
         FROM