【CHG】修改登录后获取用户权限接口

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

@@ -123,7 +123,7 @@ public class SysDictTypeController extends BaseController {
    * 获取字典选择框列表
    */
   @GetMapping("/optionselect")
-  public AjaxResult optionselect() {
+  public AjaxResult optionSelect() {
     List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
     return AjaxResult.success(dictTypes);
   }

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

@@ -111,7 +111,7 @@ public class SysPostController extends BaseController {
    * 获取岗位选择框列表
    */
   @GetMapping("/optionselect")
-  public AjaxResult optionselect() {
+  public AjaxResult optionSelect() {
     List<SysPost> posts = postService.selectPostAll();
     return AjaxResult.success(posts);
   }

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

@@ -54,14 +54,6 @@ public interface ISysMenuService {
    */
   Set<String> selectMenuBtnsByUserId(Long userId);
 
-  /**
-   * 根据用户ID查询菜单信息
-   *
-   * @param userId 用户ID
-   * @return 菜单列表
-   */
-  Set<String> selectMenuNameByUserId(Long userId);
-
   /**
    * 根据用户ID查询菜单树信息
    *

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

@@ -88,18 +88,12 @@ public class SysMenuServiceImpl implements ISysMenuService {
         permsSet.addAll(Arrays.asList(perm.trim().split(",")));
       }
     }
-    return permsSet;
-  }
-
-  /**
-   * 根据用户ID查询页面信息
-   *
-   * @param userId 用户ID
-   * @return 菜单列表
-   */
-  @Override
-  public Set<String> selectMenuPagesByUserId(Long userId) {
-    return selectMenuByTypeUserId(UserConstants.TYPE_MENU, userId);
+    Set<String> permsSet1 = new HashSet<>();
+    for (String perm : permsSet) {
+      perm = perm.replace("pc:", "").replace("app:", "");
+      permsSet1.add(perm);
+    }
+    return permsSet1;
   }
 
   /**
@@ -114,13 +108,13 @@ public class SysMenuServiceImpl implements ISysMenuService {
   }
 
   /**
-   * 根据用户ID查询菜单信息
+   * 根据用户ID查询页面信息
    *
    * @param userId 用户ID
    * @return 菜单列表
    */
   @Override
-  public Set<String> selectMenuNameByUserId(Long userId) {
+  public Set<String> selectMenuPagesByUserId(Long userId) {
     List<SysMenu> menus;
     if (SecurityUtils.isAdmin(userId)) {
       menus = menuMapper.selectMenuTreeAll();
@@ -129,7 +123,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     }
     Set<String> menuSet = new HashSet<>();
     for (SysMenu menu : menus) {
-      menuSet.add(menu.getPath());
+      menuSet.add(menu.getPerms());
     }
     return menuSet;
   }