From 30479dec41d5fcba6776d5ec78e2c0d0d3892115 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Thu, 13 Feb 2020 16:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9getToken=E3=80=81login?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8F=8D=E5=8F=82=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?typeKey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/elink/esua/epdc/dto/DataScopeDeptList.java | 5 +++++
 .../src/main/resources/mapper/SysRoleDataScopeDao.xml        | 3 ++-
 .../elink/esua/epdc/common/token/dto/DeptDataScopeDTO.java   | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DataScopeDeptList.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DataScopeDeptList.java
index 5f4ad11ec..6ebf543aa 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DataScopeDeptList.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DataScopeDeptList.java
@@ -24,4 +24,9 @@ public class DataScopeDeptList implements Serializable {
      * 部门名称
      */
     private String deptName;
+
+    /**
+     * 部门类型
+     */
+    private String typeKey;
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDataScopeDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDataScopeDao.xml
index e314e375f..22113017b 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDataScopeDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDataScopeDao.xml
@@ -15,7 +15,8 @@
     <select id="getDataScopeDetailList" resultType="com.elink.esua.epdc.dto.DataScopeDeptList">
         SELECT
             t2.dept_id,
-            t3.`name` AS deptName
+            t3.`name` AS deptName,
+            t3.type_key as typeKey
         FROM
             sys_role_user t1,
             sys_role_data_scope t2,
diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/DeptDataScopeDTO.java b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/DeptDataScopeDTO.java
index 08d4c5118..167589cc3 100644
--- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/DeptDataScopeDTO.java
+++ b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/DeptDataScopeDTO.java
@@ -24,4 +24,9 @@ public class DeptDataScopeDTO implements Serializable {
      * 部门名称
      */
     private String deptName;
+
+    /**
+     * 部门类型
+     */
+    private String typeKey;
 }