From 0f7253a4b3b4f54f1a1cf2327002a2596b41e8de Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Tue, 23 Apr 2024 14:06:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=96=E5=8F=B7=E8=8E=B7=E5=8F=96=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/system/SysUserController.java | 8 +++----- .../java/org/dromara/system/service/ISysPostService.java | 2 +- .../dromara/system/service/impl/SysPostServiceImpl.java | 6 ++---- .../src/main/resources/mapper/system/SysPostMapper.xml | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index b1502ac92..edccb4ac5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -24,7 +24,6 @@ import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.bo.SysRoleBo; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.*; @@ -132,16 +131,15 @@ public class SysUserController extends BaseController { SysUserInfoVo userInfoVo = new SysUserInfoVo(); SysRoleBo roleBo = new SysRoleBo(); roleBo.setStatus(UserConstants.ROLE_NORMAL); - SysPostBo postBo = new SysPostBo(); - postBo.setStatus(UserConstants.POST_NORMAL); List roles = roleService.selectRoleList(roleBo); userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); - userInfoVo.setPosts(postService.selectPostList(postBo)); if (ObjectUtil.isNotNull(userId)) { SysUserVo sysUser = userService.selectUserById(userId); userInfoVo.setUser(sysUser); userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId)); - userInfoVo.setPostIds(postService.selectPostListByUserId(userId)); + List sysPostVos = postService.selectPostListByUserId(userId); + userInfoVo.setPosts(sysPostVos); + userInfoVo.setPostIds(StreamUtils.toList(sysPostVos, SysPostVo::getPostId)); } return R.ok(userInfoVo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java index c43f0395c..c9966d1f3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java @@ -46,7 +46,7 @@ public interface ISysPostService { * @param userId 用户ID * @return 选中岗位ID列表 */ - List selectPostListByUserId(Long userId); + List selectPostListByUserId(Long userId); /** * 通过岗位ID串查询岗位 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java index 17cd5caae..178517059 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -9,7 +9,6 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -119,9 +118,8 @@ public class SysPostServiceImpl implements ISysPostService { * @return 选中岗位ID列表 */ @Override - public List selectPostListByUserId(Long userId) { - List list = baseMapper.selectPostsByUserId(userId); - return StreamUtils.toList(list, SysPostVo::getPostId); + public List selectPostListByUserId(Long userId) { + return baseMapper.selectPostsByUserId(userId); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 95a11b252..322403f68 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -19,7 +19,7 @@