diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java index ced36fb5a..20b6b42a7 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/biz/UserIntegrationService.java @@ -10,8 +10,10 @@ import cn.stylefeng.roses.kernel.sys.api.pojo.SimpleUserDTO; import cn.stylefeng.roses.kernel.sys.api.pojo.UserOrgDTO; import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUser; import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUserOrg; +import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUserRole; import cn.stylefeng.roses.kernel.sys.modular.user.factory.UserOrgFactory; import cn.stylefeng.roses.kernel.sys.modular.user.service.SysUserOrgService; +import cn.stylefeng.roses.kernel.sys.modular.user.service.SysUserRoleService; import cn.stylefeng.roses.kernel.sys.modular.user.service.SysUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; @@ -45,6 +47,9 @@ public class UserIntegrationService implements SysUserServiceApi { @Resource private DbOperatorApi dbOperatorApi; + @Resource + private SysUserRoleService sysUserRoleService; + @Override public SimpleUserDTO getUserInfoByUserId(Long userId) { @@ -145,7 +150,16 @@ public class UserIntegrationService implements SysUserServiceApi { @Override public List getUserRoleIdList(Long userId) { - return null; + if (userId == null) { + return new ArrayList<>(); + } + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysUserRole::getUserId, userId); + wrapper.select(SysUserRole::getRoleId); + List sysUserRoleList = this.sysUserRoleService.list(wrapper); + + return sysUserRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); } } diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java index c8ed005e2..2ddb7b4e0 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserRoleServiceImpl.java @@ -91,7 +91,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl beRemovedUserIdList) { - + // none } @Override