:zap: 增加菜单懒加载、优化部门懒加载

src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -95,7 +95,7 @@ public class DeptController extends BladeController {
 	})
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "懒加载列表", notes = "传入dept")
-	public R<List<INode>> lazyList(@ApiIgnore @RequestParam Map<String, Object> dept, @RequestParam(required = false, defaultValue = "0") Long parentId, BladeUser bladeUser) {
+	public R<List<INode>> lazyList(@ApiIgnore @RequestParam Map<String, Object> dept, Long parentId, BladeUser bladeUser) {
 		List<DeptVO> list = deptService.lazyList(bladeUser.getTenantId(), parentId, dept);
 		return R.data(DeptWrapper.build().listNodeLazyVO(list));
 	}
@@ -117,7 +117,7 @@ public class DeptController extends BladeController {
 	@GetMapping("/lazy-tree")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
-	public R<List<DeptVO>> lazyTree(String tenantId, @RequestParam(required = false, defaultValue = "0") Long parentId, BladeUser bladeUser) {
+	public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
 		List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
 		return R.data(tree);
 	}

src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -88,6 +88,22 @@ public class MenuController extends BladeController {
 		return R.data(MenuWrapper.build().listNodeVO(list));
 	}
 
+	/**
+	 * 懒加载列表
+	 */
+	@GetMapping("/lazy-list")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
+	})
+	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "列表", notes = "传入menu")
+	public R<List<MenuVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
+		List<MenuVO> list = menuService.lazyList(parentId, menu);
+		return R.data(MenuWrapper.build().listNodeLazyVO(list));
+	}
+
 	/**
 	 * 列表
 	 */

src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -15,7 +15,7 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
-    <resultMap id="deptLazyVOResultMap" type="org.springblade.modules.system.vo.DeptVO">
+    <resultMap id="deptVOResultMap" type="org.springblade.modules.system.vo.DeptVO">
         <id column="id" property="id"/>
         <result column="parent_id" property="parentId"/>
         <result column="dept_name" property="deptName"/>
@@ -43,7 +43,7 @@
         id, parent_id, dept_name, full_name, sort, remark, is_deleted
     </sql>
 
-    <select id="lazyList" resultMap="deptLazyVOResultMap">
+    <select id="lazyList" resultMap="deptVOResultMap">
         SELECT
             dept.* ,
             (
@@ -52,24 +52,23 @@
                 FROM
                     blade_dept
                 WHERE
-                    parent_id = dept.id
+                    parent_id = dept.id and is_deleted = 0
             ) AS "has_children"
         FROM
             blade_dept dept
-        <where>
-            <if test="param1!=null and param1!=''">
-                and tenant_id = #{param1}
-            </if>
-            <if test="param2!=null and param2!=''">
-                and parent_id = #{param2}
-            </if>
-            <if test="param.deptName!=null and param.deptName!=''">
-                and dept.dept_name like concat('%', #{param.deptName},'%')
-            </if>
-            <if test="param.fullName!=null and param.fullName!=''">
-                and dept.full_name like concat('%', #{param.fullName},'%')
-            </if>
-        </where>
+        WHERE dept.is_deleted = 0
+        <if test="param1!=null and param1!=''">
+            and dept.tenant_id = #{param1}
+        </if>
+        <if test="param2!=null">
+            and dept.parent_id = #{param2}
+        </if>
+        <if test="param.deptName!=null and param.deptName!=''">
+            and dept.dept_name like concat('%', #{param.deptName},'%')
+        </if>
+        <if test="param.fullName!=null and param.fullName!=''">
+            and dept.full_name like concat('%', #{param.fullName},'%')
+        </if>
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">
@@ -92,14 +91,14 @@
                 FROM
                     blade_dept
                 WHERE
-                    parent_id = dept.id
+                    parent_id = dept.id and is_deleted = 0
             ) AS "has_children"
         FROM
             blade_dept dept
         WHERE
-            parent_id = #{param2}
+            dept.parent_id = #{param2} AND dept.is_deleted = 0
         <if test="param1!=null and param1!=''">
-            and tenant_id = #{param1}
+            and dept.tenant_id = #{param1}
         </if>
     </select>
 

src/main/java/org/springblade/modules/system/mapper/MenuMapper.java

@@ -17,12 +17,12 @@
 package org.springblade.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.system.dto.MenuDTO;
 import org.springblade.modules.system.entity.Menu;
 import org.springblade.modules.system.vo.MenuVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper 接口
@@ -32,13 +32,13 @@ import java.util.List;
 public interface MenuMapper extends BaseMapper<Menu> {
 
 	/**
-	 * 自定义分页
+	 * 懒加载部门列表
 	 *
-	 * @param page
-	 * @param menu
+	 * @param parentId
+	 * @param param
 	 * @return
 	 */
-	List<MenuVO> selectMenuPage(IPage page, MenuVO menu);
+	List<MenuVO> lazyList(Long parentId, Map<String, Object> param);
 
 	/**
 	 * 树形结构

src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml

@@ -19,6 +19,23 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
+    <resultMap id="menuVOResultMap" type="org.springblade.modules.system.vo.MenuVO">
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="name" property="name"/>
+        <result column="alias" property="alias"/>
+        <result column="path" property="path"/>
+        <result column="source" property="source"/>
+        <result column="sort" property="sort"/>
+        <result column="category" property="category"/>
+        <result column="action" property="action"/>
+        <result column="is_open" property="isOpen"/>
+        <result column="remark" property="remark"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="has_children" property="hasChildren"/>
+    </resultMap>
+
     <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
         <id column="id" property="id"/>
         <result column="parent_id" property="parentId"/>
@@ -27,8 +44,33 @@
         <result column="key" property="key"/>
     </resultMap>
 
-    <select id="selectMenuPage" resultMap="menuResultMap">
-        select * from blade_menu where is_deleted = 0
+
+    <select id="lazyList" resultType="org.springblade.modules.system.vo.MenuVO">
+        SELECT
+            menu.*,
+            (
+                SELECT
+                     CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END
+                FROM
+                     blade_menu
+                WHERE
+                     parent_id = menu.id and is_deleted = 0
+            ) AS "has_children"
+        FROM
+            blade_menu menu
+        WHERE menu.is_deleted = 0
+        <if test="param1!=null">
+            and menu.parent_id = #{param1}
+        </if>
+        <if test="param.name!=null and param.name!=''">
+            and menu.name like concat('%', #{param.name},'%')
+        </if>
+        <if test="param.code!=null and param.code!=''">
+            and menu.code like concat('%', #{param.code},'%')
+        </if>
+        <if test="param.alias!=null and param.alias!=''">
+            and menu.alias like concat('%', #{param.alias},'%')
+        </if>
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">

src/main/java/org/springblade/modules/system/service/IMenuService.java

@@ -16,7 +16,6 @@
  */
 package org.springblade.modules.system.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.support.Kv;
@@ -24,6 +23,7 @@ import org.springblade.modules.system.entity.Menu;
 import org.springblade.modules.system.vo.MenuVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -33,13 +33,13 @@ import java.util.List;
 public interface IMenuService extends IService<Menu> {
 
 	/**
-	 * 自定义分页
+	 * 懒加载部门列表
 	 *
-	 * @param page
-	 * @param menu
+	 * @param parentId
+	 * @param param
 	 * @return
 	 */
-	IPage<MenuVO> selectMenuPage(IPage<MenuVO> page, MenuVO menu);
+	List<MenuVO> lazyList(Long parentId, Map<String, Object> param);
 
 	/**
 	 * 菜单树形结构

src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -29,7 +29,6 @@ import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.mapper.DeptMapper;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.vo.DeptVO;
-import org.springblade.modules.system.vo.DeptVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -52,6 +51,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		if (Func.isNotEmpty(paramTenantId) && AuthUtil.isAdministrator()) {
 			tenantId = paramTenantId;
 		}
+		if (Func.isEmpty(param.get("parentId"))) {
+			parentId = null;
+		}
 		return baseMapper.lazyList(tenantId, parentId, param);
 	}
 

src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -16,7 +16,6 @@
  */
 package org.springblade.modules.system.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -64,8 +63,11 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 	private ITopMenuSettingService topMenuSettingService;
 
 	@Override
-	public IPage<MenuVO> selectMenuPage(IPage<MenuVO> page, MenuVO menu) {
-		return page.setRecords(baseMapper.selectMenuPage(page, menu));
+	public List<MenuVO> lazyList(Long parentId, Map<String, Object> param) {
+		if (Func.isEmpty(Func.toStr(param.get("parentId")))) {
+			parentId = null;
+		}
+		return baseMapper.lazyList(parentId, param);
 	}
 
 	@Override

src/main/java/org/springblade/modules/system/vo/MenuVO.java

@@ -57,6 +57,12 @@ public class MenuVO extends Menu implements INode {
 	@JsonInclude(JsonInclude.Include.NON_EMPTY)
 	private List<INode> children;
 
+	/**
+	 * 是否有子孙节点
+	 */
+	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	private Boolean hasChildren;
+
 	@Override
 	public List<INode> getChildren() {
 		if (this.children == null) {
@@ -65,6 +71,15 @@ public class MenuVO extends Menu implements INode {
 		return this.children;
 	}
 
+	@Override
+	public Boolean getHasChildren() {
+		if (children.size() > 0) {
+			return true;
+		} else {
+			return this.hasChildren;
+		}
+	}
+
 	/**
 	 * 上级菜单
 	 */

src/main/java/org/springblade/modules/system/wrapper/MenuWrapper.java

@@ -64,4 +64,8 @@ public class MenuWrapper extends BaseEntityWrapper<Menu, MenuVO> {
 		return ForestNodeMerger.merge(collect);
 	}
 
+	public List<MenuVO> listNodeLazyVO(List<MenuVO> list) {
+		return ForestNodeMerger.merge(list);
+	}
+
 }