权限配置-树形数据查询

fiveep-controller/src/main/java/com/bizmatics/controller/web/AuthorityConfigController.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 租户管理-权限配置
@@ -32,8 +33,8 @@ public class AuthorityConfigController {
      * @return
      */
     @GetMapping("getMenuList")
-    public ApiResult<List<Object>> getMenuList(@RequestParam(value = "platformId") Integer platformId,
-                                               @RequestParam(value = "tenantId") Integer tenantId) {
+    public ApiResult<Map<String, Object>> getMenuList(@RequestParam(value = "platformId") Integer platformId,
+                                                      @RequestParam(value = "tenantId") Integer tenantId) {
         return ApiResult.success(sysPlatformMenuService.getMenuList(platformId, tenantId));
     }
 

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SysPlatformMenuMapper.java

@@ -1,7 +1,8 @@
 package com.bizmatics.persistence.mapper;
 
-import com.bizmatics.model.SysPlatformMenu;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.SysPlatformMenu;
+import com.bizmatics.model.SysTenantMenu;
 import com.bizmatics.model.system.SysMenu;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,4 +24,7 @@ public interface SysPlatformMenuMapper extends CrudMapper<SysPlatformMenu> {
     List<SysMenu> getMenuIdList(Long[] menuIds, String menuType);
 
     int deleteTenantMenuBy(Long tenantId);
+
+    List<SysTenantMenu> getMenuListOne(@Param("tenantId") Integer tenantId,
+                                       @Param("menuType") String menuType);
 }

fiveep-persistence/src/main/resources/mapper/mysql/SysPlatformMenuMapper.xml

@@ -43,4 +43,18 @@
     </delete>
 
 
+    <select id="getMenuListOne"  resultType="com.bizmatics.model.SysTenantMenu" >
+        SELECT
+        b.*
+        FROM
+        sys_menu AS a
+        JOIN sys_tenant_menu AS b ON a.menu_id = b.menu_id
+        WHERE
+        b.tenant_id = #{tenantId}
+        <if test="menuType != null and menuType != ''">
+            AND a.menu_type = #{menuType}
+        </if>
+    </select>
+
+
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/SysPlatformMenuService.java

@@ -6,6 +6,7 @@ import com.bizmatics.model.vo.SysMenuOneVo;
 import com.bizmatics.model.vo.TenantMenuVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,7 +18,7 @@ import java.util.List;
  */
 public interface SysPlatformMenuService extends CrudService<SysPlatformMenu> {
 
-    List<Object> getMenuList(Integer platformId, Integer tenantId);
+    Map<String, Object> getMenuList(Integer platformId, Integer tenantId);
 
     void updateMenu(TenantMenuVo tenantMenuVo);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/SysPlatformMenuServiceImpl.java

@@ -20,7 +20,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -94,7 +96,7 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
 //        return MenuListTwo;
 //    }
 
-    public List<Object> getMenuList(Integer platformId, Integer tenantId) {
+    public Map<String, Object> getMenuList(Integer platformId, Integer tenantId) {
         //全部目录查询
         List<SysMenu> sysMenuListTwo = baseMapper.getMenuList(platformId, "M");
         //全部菜单查询
@@ -107,6 +109,12 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
         queryWrapper.eq(SysTenantMenu::getTenantId, tenantId);
         List<SysTenantMenu> sysMenuListFour = sysTenantMenuService.list(queryWrapper);
 
+        List<SysTenantMenu> menuList = baseMapper.getMenuListOne(tenantId, "F");
+        Long[] arr = new Long[menuList.size()];
+        for (int i = 0; i < menuList.size(); i++) {
+            arr[i] = menuList.get(i).getMenuId();
+        }
+
 
         List<SysMenuTwoVo> sysMenuVoListOne = new ArrayList<>();
         List<SysMenuOneVo> SysMenuVoList = new ArrayList<>();
@@ -202,7 +210,11 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
             }
         }
 //        }
-        return list;
+        Map<String,Object> ajax = new HashMap<>();
+        ajax.put("checkedKeys",arr);
+        ajax.put("menus", list);
+
+        return ajax;
     }