租户管理-权限配置-菜单查询

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/AuthorityConfigController.java

@@ -2,11 +2,15 @@ package com.usky.system.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.system.domain.SysMenu;
+import com.usky.system.service.ISysMenuService;
 import com.usky.system.service.SysPlatformMenuService;
 import com.usky.system.service.vo.TenantMenuVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,6 +26,9 @@ public class AuthorityConfigController {
     @Autowired
     private SysPlatformMenuService sysPlatformMenuService;
 
+    @Autowired
+    private ISysMenuService menuService;
+
 
     /**
      * 租户管理-权限配置-目录查询
@@ -36,6 +43,24 @@ public class AuthorityConfigController {
         return ApiResult.success(sysPlatformMenuService.getMenuList(platformId, tenantId));
     }
 
+
+    /**
+     * 租户管理-权限配置-目录查询
+     *
+     * @param platformId 平台ID
+     * @param tenantId   租户ID
+     * @return
+     */
+    @GetMapping("getAuthorityConfigMenuList")
+    public ApiResult<Map<String, Object>> getAuthorityConfigMenuList(@RequestParam(value = "platformId") Integer platformId,
+                                                                     @RequestParam(value = "tenantId") Integer tenantId) {
+        List<SysMenu> menus =sysPlatformMenuService.getPlatformMenuList(platformId);
+        Map<String, Object> ajax = new HashMap<>();
+        ajax.put("checkedKeys", sysPlatformMenuService.selectPlatformMenu(tenantId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ApiResult.success(ajax);
+    }
+
     /**
      * 租户管理-权限配置-目录保存
      *

service-system/service-system-biz/src/main/java/com/usky/system/service/SysPlatformMenuService.java

@@ -1,9 +1,11 @@
 package com.usky.system.service;
 
 import com.usky.common.mvc.base.CrudService;
+import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.SysPlatformMenu;
 import com.usky.system.service.vo.TenantMenuVo;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,6 +18,10 @@ import java.util.Map;
  */
 public interface SysPlatformMenuService extends CrudService<SysPlatformMenu> {
 
+    List<SysMenu> getPlatformMenuList(Integer platformId);
+
+    Long[] selectPlatformMenu(Integer tenantId);
+
     Map<String, Object> getMenuList(Integer platformId, Integer tenantId);
 
     void updateMenu(TenantMenuVo tenantMenuVo);

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPlatformMenuServiceImpl.java

@@ -36,6 +36,23 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
     @Autowired
     private SysTenantMenuService sysTenantMenuService;
 
+
+    public List<SysMenu> getPlatformMenuList(Integer platformId){
+        return baseMapper.getMenuList(platformId, null);
+    }
+
+    public Long[] selectPlatformMenu(Integer tenantId){
+        LambdaQueryWrapper<SysTenantMenu> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SysTenantMenu::getTenantId, tenantId);
+        List<SysTenantMenu> menuList = sysTenantMenuService.list(queryWrapper);
+        Long[] arr = new Long[menuList.size()];
+        for (int i = 0; i < menuList.size(); i++) {
+            arr[i] = menuList.get(i).getMenuId();
+        }
+        return arr;
+    }
+
+
     public Map<String, Object> getMenuList(Integer platformId, Integer tenantId) {
         //全部目录查询
         List<SysMenu> sysMenuListTwo = baseMapper.getMenuList(platformId, "M");