fix 用户列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysUserController.java

@@ -216,7 +216,7 @@ public class SysUserController extends BaseController
         int result = userService.updateUser(user);
         if(result>0){
             SysUser newUser = userService.selectUserByUserName(loginUser.getUser().getUserName());
-            //同个用户ID则更新用户信息,admin操作则不更新
+            //同个用户ID则更新用户信息,admin操作其他用户则不更新
             if(newUser.getUserId()==loginUser.getUser().getUserId()){
                 // 更新缓存用户
                 loginUser.setUser(newUser);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserAddBo.java

@@ -86,7 +86,7 @@ public class UserAddBo {
     private Integer status;
     @ApiModelProperty("$column.columnComment")
     private String unionId;
-    @ApiModelProperty("注册平台 1小程序")
+    @ApiModelProperty("注册平台 1小程序 2网站")
     private String registerPlat;
     @ApiModelProperty("最后登录IP")
     private String lastLoginIp;

zhongzheng-system/src/main/resources/mapper/modules/system/SysUserMapper.xml

@@ -83,9 +83,13 @@
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
-        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
+        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
+        r.role_id,
+        r.role_name from
         sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
+        LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id
+        LEFT JOIN sys_role r ON r.role_id = ur.role_id
         where u.del_flag = '0'
         <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')