From dcf4a0bf36efc7b385fa00619c772879ce0984ea Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Tue, 12 Jan 2021 19:55:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90SysUserRule=E3=80=91=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=88=86=E9=85=8D=E8=A7=92?= =?UTF-8?q?=E8=89=B2ID=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/user/pojo/response/SysUserResponse.java | 5 +++++ .../modular/user/service/SysUserRoleService.java | 10 ++++++++++ .../user/service/impl/SysUserRoleServiceImpl.java | 11 ++++++++++- .../modular/user/service/impl/SysUserServiceImpl.java | 3 +++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java index 8403d336e..1c5875cff 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; +import java.util.List; /** * 系统用户结果 @@ -80,4 +81,8 @@ public class SysUserResponse { */ private Integer statusFlag; + /** + * 用户角色id + */ + private List grantRoleIdList; } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java index c0f2552cc..19ebf8518 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java @@ -23,6 +23,16 @@ public interface SysUserRoleService extends IService { */ List getUserRoles(Long userId); + /** + * 获取账号绑定的角色id集合 + * + * @param userId 用户id + * @return 角色id集合 + * @author chenjinlong + * @date 2021/1/12 19:42 + */ + List getUserRoleIds(Long userId); + /** * 给某个用户授权角色 * diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java index 25e8bbc00..cd769ecf4 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java @@ -4,8 +4,8 @@ import cn.stylefeng.roses.kernel.system.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserRoleMapper; -import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService; +import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 系统用户角色service接口实现类 @@ -37,6 +38,14 @@ public class SysUserRoleServiceImpl extends ServiceImpl getUserRoleIds(Long userId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysUserRole::getUserId, userId); + List list = this.list(wrapper); + return list.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); + } + @Override @Transactional(rollbackFor = Exception.class) public void grantRole(SysUserRequest sysUserRequest) { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index d349ba32b..2579c73ab 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -313,6 +313,9 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUserResponse.setOrgId(userOrgInfo.getOrgId()); sysUserResponse.setPositionId(userOrgInfo.getPositionId()); + // 获取用户角色信息 + sysUserResponse.setGrantRoleIdList(sysUserRoleService.getUserRoleIds(sysUser.getUserId())); + return sysUserResponse; }