测试1

Cpop-Oam/src/main/java/com/cpop/oam/business/controller/RoleController.java

@@ -1,10 +1,8 @@
 package com.cpop.oam.business.controller;
 
-import com.mybatisflex.core.paginate.Page;
 import com.cpop.core.annontation.OperationLog;
 import com.cpop.core.base.R;
 import com.cpop.core.base.enums.OperationLogEnum;
-import com.cpop.oam.business.bo.MenuListBo;
 import com.cpop.oam.business.bo.RoleBo;
 import com.cpop.oam.business.bo.RolePageBo;
 import com.cpop.oam.business.bo.RoleStatusBo;
@@ -12,6 +10,7 @@ import com.cpop.oam.business.service.MenuService;
 import com.cpop.oam.business.service.RoleService;
 import com.cpop.oam.business.vo.MenuVo;
 import com.cpop.oam.business.vo.RolePageVo;
+import com.mybatisflex.core.paginate.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,10 +74,10 @@ public class RoleController {
     @PreAuthorize("@aps.hasPermission('system:role:insert')")
     @ApiOperation("获取菜单树列表")
     @GetMapping("/getMenuTreeList")
-    public R<List<MenuVo>> getMenuTreeList(MenuListBo bo) {
+    public R<List<MenuVo>> getMenuTreeList() {
-        List<MenuVo> list = menuService.getOamMenuTreeList(bo);
+        List<MenuVo> list = menuService.getFilterAuthMenuTreeList();
         //过滤掉没有权限的数据
-        return R.ok(roleService.filterAuthMenu(list));
+        return R.ok(list);
     }
 
     /**

Cpop-Oam/src/main/java/com/cpop/oam/business/service/MenuService.java

@@ -66,4 +66,13 @@ public interface MenuService extends IService<Menu> {
      * @return java.util.List<com.jambox.system.business.vo.SysMenuRouteVo>
      */
     List<MenuRouteVo> getOamMenuList();
+
+    /**
+     * @Description: 获取菜单树列表
+     * @param
+     * @return List<MenuVo>
+     * @Author DB
+     * @Date: 2023/10/11 19:47
+     */
+    List<MenuVo> getFilterAuthMenuTreeList();
 }

Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java

@@ -233,6 +233,17 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
         }
     }
 
+    @Override
+    public List<MenuVo> getFilterAuthMenuTreeList() {
+        List<MenuVo> menuVos = this.listAs(QueryWrapper.create()
+                .where(MENU.NAME.isNull().or(MENU.NAME.ne(Constants.HIDE_MENU)))
+                .orderBy(MENU.ORDER_NO.asc()), MenuVo.class);
+        return buildMenuTree(menuVos.stream()
+                //当类型不为目录的时候，必须要有权限标记
+                .filter(item -> !(item.getType() != 0 && StringUtils.isNotBlank(item.getPermission())))
+                .collect(Collectors.toList()));
+    }
+
     /**
      * @Description: 构建菜单路由树
      * @param menus 菜单集合