From 38b3081f3c14671be32aef01853426cd56965428 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Sep 2022 16:44:23 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E7=99=BB=E5=BD=95=E5=90=8EuserInfo?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0roleCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/modules/system/entity/SysUser.java | 4 ++++ .../com/jero/modules/system/service/impl/SysBaseApiImpl.java | 2 ++ .../jero/modules/system/service/impl/SysUserServiceImpl.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index 19ce51c5..1d7086ad 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -221,6 +221,10 @@ public class SysUser implements Serializable { @ApiModelProperty(value = "RSA公钥") private String rsapublickey; + @TableField(exist = false) + @ApiModelProperty(value = "roleCode") + private String roleCode; + /** * 确认密码 */ diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java index 4feeff24..da49acd5 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java @@ -279,6 +279,8 @@ public class SysBaseApiImpl implements ISysBaseAPI { BeanUtils.copyProperties(sysUser, loginUser); List departNameByUsername = sysDepartMapper.getDepartNameByUserId(sysUser.getId()); loginUser.setDepartNames(StringUtils.join(departNameByUsername, ",")); + List roleByUserName = sysUserRoleMapper.getRoleByUserName(sysUser.getUsername()); + loginUser.setRoleCode(StringUtils.join(roleByUserName, ",")); return loginUser; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index bbc93f89..ef11d791 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -752,8 +752,10 @@ public class SysUserServiceImpl extends ServiceImpl impl // update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去 obj.put("multi_depart", 2); } + LoginUser userById = sysBaseAPI.getUserById(sysUser.getId()); sysUser.setPhone(PasswordUtil.decrypt(sysUser.getPhone())); sysUser.setEmail(PasswordUtil.decrypt(sysUser.getEmail())); + sysUser.setRoleCode(userById.getRoleCode()); obj.put("token", token); obj.put("userInfo", sysUser); obj.put("sysAllDictItems", sysDictService.queryAllDictItems());