fix: ui角色映射

gis_admin/src/main/java/com/gis/admin/controller/LoginController.java

@@ -89,12 +89,12 @@ public class LoginController {
         }
 
         Long userId = entity.getId();
-//        Object role = getRole(userId);
-        SysRoleEntity role = getRole(userId);
+        Object role = getRoleKey(userId);
+//        SysRoleEntity role = getRole(userId);
         log.info("role: {}", role);
-        String roleKey = role.getRoleKey();
+//        String roleKey = role.getRoleKey();
 
-        if ("cms".equals(from) && roleKey.contains("sys_visitor")) {
+        if ("cms".equals(from) && ((Set)role).contains("sys_visitor")) {
                  log.error("游客不能登录管理后台");
                  return Result.failure("非法用户");
          }
@@ -116,7 +116,7 @@ public class LoginController {
         HashMap<String, Object> tokenMap = new HashMap<>();
         tokenMap.put("userName", entity.getUserName());
         tokenMap.put("id", userId);
-        tokenMap.put("role", getRoleKey(userId));
+        tokenMap.put("role", role);
 
         String token = JwtUtil.createJWT(TOKEN_EXPIRE, tokenMap);
 
@@ -125,8 +125,8 @@ public class LoginController {
         result.put("user", entity);
         result.put("token", token);
         // 角色控制系统管理（sys_admin）、内容管理
-        result.put("role", roleKey);
-        result.put("roleName", role.getRoleName());
+        result.put("role", role);
+//        result.put("roleName", role.getRoleName());
 
 
         // 保存操作日志

gis_admin/src/main/java/com/gis/admin/entity/po/SysUserEntity.java

@@ -64,6 +64,10 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "角色id")
     private Integer roleId;
 
+    @Transient
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
+
 
 
 }

gis_admin/src/main/java/com/gis/admin/mapper/SysUserMapper.java

@@ -16,6 +16,7 @@ public interface SysUserMapper extends IBaseMapper<SysUserEntity, Long> {
     @Select(value = "select * from sys_user where is_delete = '0' AND user_name= #{userName}")
     SysUserEntity findByUserName(String userName);
 
-    @Select(value = "select a.*, b.role_id as roleId from sys_user a left join sys_user_role b on b.user_id = a.id where a.is_delete = '0' AND a.id= #{id}")
+    @Select(value = "select a.*, b.role_id as roleId, c.role_name as roleName from sys_user a left join sys_user_role b on b.user_id = a.id " +
+            "left join sys_role c on c.id=b.role_id where a.is_delete = '0' AND a.id= #{id}")
     SysUserEntity detailMapper(Long id);
 }