【CHG】用户信息返回数据格式调整

railway-admin/src/main/java/com/railway/web/controller/system/SysProfileController.java

@@ -4,6 +4,7 @@ import com.railway.common.annotation.Log;
 import com.railway.common.constant.UserConstants;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.domain.entity.SysRole;
 import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.domain.model.LoginUser;
 import com.railway.common.enums.BusinessType;
@@ -11,9 +12,11 @@ import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.framework.web.service.TokenService;
 import com.railway.system.service.ISysFileService;
+import com.railway.system.service.ISysRoleService;
 import com.railway.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import java.util.List;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -34,12 +37,15 @@ import org.springframework.web.multipart.MultipartFile;
 public class SysProfileController extends BaseController {
 
   private final ISysUserService userService;
+  private final ISysRoleService roleService;
   private final TokenService tokenService;
   private final ISysFileService sysFileService;
 
   public SysProfileController(ISysUserService userService,
-      TokenService tokenService, ISysFileService sysFileService) {
+      ISysRoleService roleService, TokenService tokenService,
+      ISysFileService sysFileService) {
     this.userService = userService;
+    this.roleService = roleService;
     this.tokenService = tokenService;
     this.sysFileService = sysFileService;
   }
@@ -52,6 +58,10 @@ public class SysProfileController extends BaseController {
   public AjaxResult profile() {
     LoginUser loginUser = getLoginUser();
     SysUser user = loginUser.getUser();
+    List<Long> roleIds = roleService.selectRoleListByUserId(user.getUserId());
+    user.setRoleIds(roleIds.toArray(new Long[0]));
+    List<SysRole> roles = roleService.selectRolesByUserId(user.getUserId());
+    user.setRoles(roles);
     AjaxResult ajax = AjaxResult.success(user);
     ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
     ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));

railway-admin/src/main/java/com/railway/web/controller/system/SysUserController.java

@@ -200,7 +200,10 @@ public class SysUserController extends BaseController {
   public AjaxResult authRole(@PathVariable("userId") Long userId) {
     AjaxResult ajax = AjaxResult.success();
     SysUser user = userService.selectUserById(userId);
+    List<Long> roleIds = roleService.selectRoleListByUserId(userId);
+    user.setRoleIds(roleIds.toArray(new Long[0]));
     List<SysRole> roles = roleService.selectRolesByUserId(userId);
+    user.setRoles(roles);
     ajax.put("user", user);
     ajax.put("roles", SysUser.isAdmin(userId) ? roles
         : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));

railway-system/src/main/java/com/railway/system/mapper/SysRoleMapper.java

@@ -41,7 +41,7 @@ public interface SysRoleMapper {
    * @param userId 用户ID
    * @return 选中角色ID列表
    */
-  List<Integer> selectRoleListByUserId(Long userId);
+  List<Long> selectRoleListByUserId(Long userId);
 
   /**
    * 通过角色ID查询角色

railway-system/src/main/java/com/railway/system/service/ISysRoleService.java

@@ -49,7 +49,7 @@ public interface ISysRoleService {
    * @param userId 用户ID
    * @return 选中角色ID列表
    */
-  List<Integer> selectRoleListByUserId(Long userId);
+  List<Long> selectRoleListByUserId(Long userId);
 
   /**
    * 通过角色ID查询角色

railway-system/src/main/java/com/railway/system/service/impl/SysRoleServiceImpl.java

@@ -114,7 +114,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
    * @return 选中角色ID列表
    */
   @Override
-  public List<Integer> selectRoleListByUserId(Long userId) {
+  public List<Long> selectRoleListByUserId(Long userId) {
     return roleMapper.selectRoleListByUserId(userId);
   }
 

railway-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -66,7 +66,7 @@
     <include refid="selectRoleVo"/>
   </select>
 
-  <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
+  <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
     select r.role_id
     from sys_role r
     left join sys_user_role ur on ur.role_id = r.role_id