浏览代码

修改SysUserRole实体类

tsurumure 9 月之前
父节点
当前提交
17e8b14eb4

+ 15 - 0
src/main/java/com/backendsys/modules/system/controller/SysUserRoleV2Controller.java

@@ -0,0 +1,15 @@
+package com.backendsys.modules.system.controller;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统用户角色
+ */
+@Validated
+@RestController
+public class SysUserRoleV2Controller {
+
+
+
+}

+ 2 - 1
src/main/java/com/backendsys/modules/system/dao/SysUserRoleDao.java

@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface SysUserRoleDao {
     // 获得用户角色
-    List<SysUserRole> selectRoleByUserId(Long user_id);
+    List<Map<String, Object>> selectRoleByUserId(Long user_id);
 }

+ 2 - 1
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUserInfo.java

@@ -12,6 +12,7 @@ import jakarta.validation.constraints.NotNull;
 
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 @Data
 @TableName("sys_user_info")
@@ -47,7 +48,7 @@ public class SysUserInfo {
     private Integer del_flag;
 
     @TableField(exist = false)
-    private List<SysUserRole> roles;
+    private List<Map<String, Object>> roles;
 
     @TableField(exist = false)
     private List<Long> role_id;

+ 11 - 0
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUserRole.java

@@ -1,9 +1,20 @@
 package com.backendsys.modules.system.entity.SysUser;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
+@TableName("sys_user_role")
 public class SysUserRole {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    @TableField(exist = false)
     private Long role_id;
     private String role_name;
+    private String role_description;
+    private Integer sort;
+    private Integer status;
 }

+ 3 - 2
src/main/java/com/backendsys/modules/system/service/impl/SysUserV2ServiceImpl.java

@@ -95,10 +95,11 @@ public class SysUserV2ServiceImpl extends ServiceImpl<SysUserDao, SysUser> imple
         BeanUtils.copyProperties(sysUser, sysUserInfo);
 
         // 获得 用户角色(绑定关系)
-        List<SysUserRole> roles = sysUserRoleDao.selectRoleByUserId(user_id);
+        List<Map<String, Object>> roles = sysUserRoleDao.selectRoleByUserId(user_id);
         sysUserInfo.setRoles(roles);
 
-        List<Long> role_ids = roles.stream().map(SysUserRole::getRole_id).collect(Collectors.toList());
+//        List<Long> role_ids = roles.stream().map(SysUserRole::getRole_id).collect(Collectors.toList());
+        List<Long> role_ids = roles.stream().map(m -> Convert.toLong(m.get("role_id"))).collect(Collectors.toList());
         sysUserInfo.setRole_id(role_ids);
 
         List<String> modules = sysUserRoleModuleRelationDao.selectUserRoleModuleIdsByRoleIds(role_ids);

+ 7 - 1
src/main/resources/mapper/system/SysUserRoleDao.xml

@@ -2,7 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.backendsys.modules.system.dao.SysUserRoleDao">
 
-    <select id="selectRoleByUserId" resultType="com.backendsys.modules.system.entity.SysUser.SysUserRole">
+    <resultMap id="resultMapUserRole" type="java.util.LinkedHashMap">
+        <result property="role_id" column="role_id" javaType="java.lang.Long" />
+        <result property="role_name" column="role_name" />
+    </resultMap>
+
+    <!-- resultType="com.backendsys.modules.system.entity.SysUser.SysUserRole" -->
+    <select id="selectRoleByUserId" resultMap="resultMapUserRole">
         SELECT
             surr.role_id role_id,
             sur.role_name role_name