Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/vo/SysUserVO.java

@@ -190,4 +190,8 @@ public class SysUserVO implements Serializable {
     private Boolean workFlag;
 
     private String email;
+
+    private String deptName;
+
+    private String roleName;
 }

platform-dao/src/main/resources/mapper/upms/SysUserMapper.xml

@@ -36,7 +36,7 @@
 
     <select id="selectVOByKeyword" resultType="com.platform.dao.vo.SysUserVO"
             parameterType="com.platform.dao.dto.upms.SysUserDTO">
-        select distinct u.* from t_sys_user u
+        select distinct u.*,dept.name as deptName,srole.role_name as roleName from t_sys_user u
         join t_sys_user_role role
         on u.user_id=role.user_id left join t_sys_role srole on role.role_id=srole.role_id
         left join t_sys_user_dept ud on ud.user_id = u.user_id