Merge branch 'han' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysMenuController.java

@@ -68,11 +68,9 @@ public class SysMenuController extends BaseController
      * 获取菜单下拉树列表
      */
     @GetMapping("/treeselect")
-    public ApiResult treeselect(SysMenu menu)
+    public ApiResult treeselect()
     {
-//        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuListTwo(menu);
-        return ApiResult.success(menuService.buildMenuTreeSelect(menus));
+        return ApiResult.success(menuService.selectRolePlatformMenu());
     }
 
     /**
@@ -101,7 +99,7 @@ public class SysMenuController extends BaseController
         List<SysMenu> menus = menuService.selectMenuListTwo(menu);
         Map<String,Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
-        ajax.put("menus", menuService.selectRolePlatformMenu(roleId));
+        ajax.put("menus", menuService.selectRolePlatformMenu());
         return ApiResult.success(ajax);
     }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysMenuService.java

@@ -195,9 +195,7 @@ public interface ISysMenuService extends CrudService<SysMenu>
 
     /**
      * 根据角色ID查询应用菜单树信息
-     *
-     * @param roleId 角色ID
      * @return 选中菜单列表
      */
-    List<TenantPlatformMenuVo> selectRolePlatformMenu(Long roleId);
+    List<TenantPlatformMenuVo> selectRolePlatformMenu();
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -878,7 +878,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
     }
 
     @Override
-    public List<TenantPlatformMenuVo> selectRolePlatformMenu(Long roleId)
+    public List<TenantPlatformMenuVo> selectRolePlatformMenu()
     {
         List<TenantPlatformMenuVo> list1 = new ArrayList<>();
         List<SysPlatformVo> list = sysPlatformMapper.getTenantPlatformList(SecurityUtils.getTenantId());