1. 修复bug

src/main/java/com/supervision/police/dto/user/LoginResVO.java

@@ -4,6 +4,7 @@ package com.supervision.police.dto.user;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.supervision.police.domain.SystemUser;
+import com.supervision.police.dto.RoleDTO;
 import com.supervision.utils.TokenUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -26,8 +27,8 @@ public class LoginResVO {
     @Schema(description = "用户名称")
     private String userName;
 
-    @Schema(description = "用户角色编码")
-    private String roleCode;
+    @Schema(description = "用户角色列表")
+    private List<UserRoleDTO> roleList;
 
     @Schema(description = "菜单权限标识")
     private List<String> permission = new ArrayList<>();
@@ -65,6 +66,6 @@ public class LoginResVO {
         if (CollUtil.isEmpty(roleMenuDTOS)){
             return;
         }
-        this.permission = roleMenuDTOS.stream().map(RoleMenuDTO::getLabelCode).collect(Collectors.toList());
+        this.permission = roleMenuDTOS.stream().map(RoleMenuDTO::getLabelCode).filter(Objects::nonNull).collect(Collectors.toList());
     }
 }

src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.supervision.police.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -46,12 +48,14 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         SystemUser systemUser = super.getOne(new LambdaQueryWrapper<SystemUser>().eq(SystemUser::getAccount, reqVO.getUserAccount()));
         Assert.notNull(systemUser, "用户名或密码有误！");
         Assert.notNull(UserUtil.checkUserPassword(reqVO.getPassword(), systemUser.getUserPd()), "用户名或密码有误！");
-        Assert.isTrue(systemUser.getStatus() == 0, "该用户已被停用，请联系管理员！");
+        Assert.isTrue(Integer.valueOf(0).equals(systemUser.getStatus()), "该用户已被停用，请联系管理员！");
 
         // 组装用户信息
         LoginResVO loginResVO = new LoginResVO(systemUser);
         // 设置用户token信息
         loginResVO.setToken(new UserInfoDTO(systemUser));
+
+        loginResVO.setRoleList(userRoleRelationManageService.listUserRoleByUserIdList(CollUtil.newArrayList(systemUser.getId())));
         // 设置用户权限信息
         loginResVO.roleMenuDTOSetPermission(userRoleRelationManageService.listUserRoleMenu(systemUser.getId()));
         return loginResVO;
@@ -100,9 +104,8 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                 .set(SystemUser::getUserName, userInfoReqVo.getUserName())
                 .set(SystemUser::getAccount, userInfoReqVo.getAccount())
                 .set(SystemUser::getPhoneNum, userInfoReqVo.getPhoneNum())
-                .set(SystemUser::getStatus, userInfoReqVo.getStatus())
+                .set(Objects.nonNull(userInfoReqVo.getStatus()),SystemUser::getStatus, userInfoReqVo.getStatus())
                 .set(SystemUser::getRemark, userInfoReqVo.getRemark())
-
                 .eq(SystemUser::getId, userInfoReqVo.getId())
                 .update();
 

src/main/resources/mapper/SystemUserRoleRelationMapper.xml

@@ -43,7 +43,7 @@
                m.label,
                m.label_code
         from system_user_role_relation ur
-                 left join system_role_menu_relation rm on ur.user_id = rm.id
+                 left join system_role_menu_relation rm on ur.role_id = rm.role_id
                  left join system_menu m on rm.menu_id = m.id
         where ur.user_id = #{userId}
     </select>