代码优化

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserProjectServiceImpl.java

@@ -160,6 +160,7 @@ public class SysUserProjectServiceImpl extends AbstractBaseService<SysUserProjec
         SysUserProjectBo sup = new SysUserProjectBo();
         sup.setProjectId(bo.getProjectId());
         sup.setRoleId(bo.getRoleId());
+        String userType = UserType.PROJECT_USER.getUserType();
         if (bo.getUserId() != null) {
             sup.setUserId(bo.getUserId());
         } else {
@@ -177,13 +178,14 @@ public class SysUserProjectServiceImpl extends AbstractBaseService<SysUserProjec
                 su.setEmail(bo.getEmail());
                 su.setPassword(bo.getPassword());
                 su.setCreateBy(bo.getCreateBy());
+                su.setUserType(userType);
                 userService.insertUser(su);
                 //查询用户
-                user = sysUserMapper.selectOne(SysUser::getUserType, UserType.PROJECT_USER.getUserType(), SysUser::getPhonenumber, bo.getPhonenumber());
+                user = sysUserMapper.selectOne(SysUser::getUserType, userType, SysUser::getPhonenumber, bo.getPhonenumber());
                 sup.setUserId(user.getUserId());
             }
         }
-        sup.setUserType(UserType.PROJECT_USER.getUserType());
+        sup.setUserType(userType);
         insertByBo(sup);
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -73,6 +73,11 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
         Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
+        processData(page);
+        return TableDataInfo.build(page);
+    }
+
+    private void processData(Page<SysUserVo> page) {
         List<Long> userIds = StreamUtils.toList(page.getRecords(), SysUserVo::getUserId);
         userIds = CollectionUtils.isEmpty(userIds) ? List.of(-1L) : userIds;
         //获取角色信息
@@ -91,12 +96,12 @@ public class SysUserServiceImpl implements ISysUserService {
                 record.setRoles(StreamUtils.toList(rIds, roleId -> BeanUtil.copyProperties(StreamUtils.findFirst(finalRoleList, r -> Objects.equals(r.getRoleId(), roleId)), SysRoleVo.class)));
             }
         }
-        return TableDataInfo.build(page);
     }
 
     @Override
     public TableDataInfo<SysUserVo> selectPageUserFullList(SysUserBo user, PageQuery pageQuery) {
         Page<SysUserVo> page = baseMapper.selectPageUserFullList(pageQuery.build(), this.buildQueryWrapper(user));
+        processData(page);
         return TableDataInfo.build(page);
     }