From ea920bcf58a7af3ec859a4e5aa9446ac8cb14d3e Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Fri, 25 Oct 2019 09:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=BC=96=E7=A0=81=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java     | 4 ++--
 .../main/java/com/elink/esua/epdc/entity/SysRoleEntity.java   | 4 ++--
 .../src/main/resources/mapper/SysUserDao.xml                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
index 22f5b608f..ec29b3a51 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java
@@ -43,9 +43,9 @@ public class SysRoleDTO implements Serializable {
     private String name;
 
     /**
-     * 角色编码
+     * 角色类型键值(数据字典sysRoleType)
      */
-    private String code;
+    private String typeKey;
 
     /**
      * 备注
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysRoleEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysRoleEntity.java
index 4b478b677..20523d9ce 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysRoleEntity.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysRoleEntity.java
@@ -35,9 +35,9 @@ public class SysRoleEntity extends BaseEntity {
      */
     private String name;
     /**
-     * 角色编码
+     * 角色类型键值(数据字典sysRoleType)
      */
-    private String code;
+    private String typeKey;
     /**
      * 备注
      */
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
index d67b18d16..56eb388a6 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
@@ -70,7 +70,7 @@
             LEFT JOIN sys_dept d ON d.id = rds.dept_id
         WHERE
             d.type_key = 'grid_party'
-            AND r.`code` = 'gridLeader'
+            AND r.type_key = 'gridLeader'
             AND u.mobile = #{mobile}
         ORDER BY
             d.create_date DESC