user

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/domain/vo/UserInfoVo.java

@@ -28,7 +28,7 @@ public class UserInfoVo {
     /**
      * Role Id
      */
-    private String role;
+    private Long roleId;
 
     /**
      * 権限List

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/sys/security/UserDetailsServiceImpl.java

@@ -1,6 +1,7 @@
 package jp.yamoto.farm.crm.biz.sys.security;
 
 import jp.yamoto.farm.common.utils.ConvertUtils;
+import jp.yamoto.farm.common.utils.ValueUtils;
 import jp.yamoto.farm.crm.biz.sys.service.ISysUserService;
 import jp.yamoto.farm.common.core.domain.entity.SysUser;
 import jp.yamoto.farm.common.core.domain.model.LoginUser;
@@ -56,6 +57,10 @@ public class UserDetailsServiceImpl implements UserDetailsService
             throw new ServiceException(MessageUtils.message("E0049"));
         }
 
+        if(ValueUtils.isNotEmpty(user.getRoleIds())){
+            user.setRoleId(user.getRoleIds()[0]);
+        }
+
         passwordService.validate(user.getPassword());
 
         return createLoginUser(user);

farm-crm-biz/src/main/resources/mapper/crm/SysMenuMapper.xml

@@ -141,7 +141,7 @@
 		  , m.menu_name
 		  , m.path
 		  , m.component
-		  , m.`query`
+		  , m.query
 		  , m.route_name
 		  , m.visible
 		  , m.status
@@ -218,7 +218,7 @@
 			<if test="orderNum != null">order_num = #{orderNum},</if>
 			<if test="path != null and path != ''">path = #{path},</if>
 			<if test="component != null">component = #{component},</if>
-			<if test="query != null">`query` = #{query},</if>
+			<if test="query != null">query = #{query},</if>
 			<if test="routeName != null">route_name = #{routeName},</if>
 			<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
 			<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
@@ -242,7 +242,7 @@
 		<if test="orderNum != null">order_num,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="component != null and component != ''">component,</if>
-		<if test="query != null and query != ''">`query`,</if>
+		<if test="query != null and query != ''">query,</if>
 		<if test="routeName != null">route_name,</if>
 		<if test="isFrame != null and isFrame != ''">is_frame,</if>
 		<if test="isCache != null and isCache != ''">is_cache,</if>

farm-crm/src/main/java/jp/yamoto/farm/crm/web/controller/system/SysLoginController.java

@@ -38,6 +38,9 @@ public class SysLoginController
     @Autowired
     private SysPermissionService permissionService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * ログイン
      * 
@@ -61,18 +64,19 @@ public class SysLoginController
         LoginUser<SysUser> loginUser = SecurityUtils.getLoginUser();
         SysUser user = loginUser.getUser();
         // ロール集合
-       // Set<String> roles = permissionService.getRolePermission(user);
+        //Set<String> roles = permissionService.getRolePermission(user);
         // 権限集合
-       // Set<String> permissions = permissionService.getMenuPermission(user);
-       // if (!loginUser.getPermissions().equals(permissions)) {
-       //     loginUser.setPermissions(permissions);
-       //     tokenService.refreshToken(loginUser);
-       // }
+       Set<String> permissions = permissionService.getMenuPermission(user);
+       if (!loginUser.getPermissions().equals(permissions)) {
+            loginUser.setPermissions(permissions);
+            tokenService.refreshToken(loginUser);
+        }
 
         UserInfoVo userInfoVo = new UserInfoVo();
         userInfoVo.setUserName(user.getNickName());
         userInfoVo.setUserId(user.getUserName());
-        userInfoVo.setRole("SUPER_ADMIN");
+        userInfoVo.setRoleId(user.getRoleId());
+        userInfoVo.setPermissions(permissions);
         AjaxResult ajax = AjaxResult.success(userInfoVo);
 
         return ajax;
@@ -107,13 +111,13 @@ public class SysLoginController
         LoginUser<SysUser> loginUser = SecurityUtils.getLoginUser();
         SysUser user = loginUser.getUser();
         // ロール集合
-        // Set<String> roles = permissionService.getRolePermission(user);
+        //Set<String> roles = permissionService.getRolePermission(user);
         // 権限集合
          Set<String> permissions = permissionService.getMenuPermission(user);
-        // if (!loginUser.getPermissions().equals(permissions)) {
-        //     loginUser.setPermissions(permissions);
-        //     tokenService.refreshToken(loginUser);
-        // }
+        if (!loginUser.getPermissions().equals(permissions)) {
+            loginUser.setPermissions(permissions);
+            tokenService.refreshToken(loginUser);
+        }
        return AjaxResult.success(permissions);
     }
 

farm-crm/src/main/java/jp/yamoto/farm/crm/web/controller/system/SysUserController.java

@@ -95,7 +95,7 @@ public class SysUserController extends BaseController
     {
         userService.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
-        List<SysRole> roles = roleService.selectRolesByUserId(userId);
+        //List<SysRole> roles = roleService.selectRolesByUserId(userId);
         //ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         if (StringUtils.isNotNull(userId))
         {