修复菜单接口报错

flow-app/src/main/resources/mapper/system/MenuDao.xml

@@ -33,7 +33,7 @@
         </if>
     </sql>
 
-    <sql id="getTree_mysql">
+<!--    <sql id="getTree_mysql">
         with recursive cte as (
             select * from sys_menu
             <where>
@@ -43,7 +43,7 @@
             select sm.* from sys_menu sm, cte where sm.id = cte.pid
         )
         select * from cte order by sort asc
-    </sql>
+    </sql>-->
 
     <sql id="getTree_oracle">
         SELECT DISTINCT * FROM SYS_MENU
@@ -52,9 +52,9 @@
         CONNECT BY PRIOR pid = id
     </sql>
 
-    <select id="getTree" resultMap="BaseResultMap">
+<!--    <select id="getTree" resultMap="BaseResultMap">
         <include refid="getTree_mysql"></include>
-    </select>
+    </select>-->
 
 
 </mapper>

flow-system/flow-system-biz/src/main/java/com/flow/dao/MenuDao.java

@@ -10,5 +10,5 @@ import java.util.List;
 
 public interface MenuDao extends BaseDao<Menu> {
 
-    List<Menu> getTree(@Param("menuQuery") MenuQuery menuQuery);
+    // List<Menu> getTree(@Param("menuQuery") MenuQuery menuQuery);
 }

flow-system/flow-system-biz/src/main/java/com/flow/service/impl/DeptServiceImpl.java

@@ -55,6 +55,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptDao, Dept> implements D
         //List<Dept> list = this.getList(deptQuery);
         List<Dept> list = deptDao.lambdaQueryChain()
                 .eq(deptQuery.getPid() != null, Dept::getId, deptQuery.getPid())
+                .like(deptQuery.getName() != null, Dept::getName, deptQuery.getName())
                 .orderByAsc(Dept::getSort)
                 .list();
         //构建部门树

flow-system/flow-system-biz/src/main/java/com/flow/service/impl/MenuServiceImpl.java

@@ -1,6 +1,7 @@
 package com.flow.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.flow.common.mybatis.service.impl.BaseServiceImpl;
 import com.flow.dao.MenuDao;
@@ -26,8 +27,12 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuDao, Menu> implements M
 
     @Override
     public List<Menu> getTree(MenuQuery menuQuery) {
-        List<Menu> list = menuDao.getTree(menuQuery);
-        //构建菜单树
+        List<Menu> list = menuDao.lambdaQueryChain()
+                .like(menuQuery.getTitle() != null, Menu::getTitle, menuQuery.getTitle())
+                .eq(menuQuery.getPid() != null, Menu::getPid, menuQuery.getPid())
+                .orderByAsc(Menu::getSort)
+                .list();
+        // 构建菜单树
         return list.stream()
                 .filter(m -> m.getPid() == 0)
                 .sorted(Comparator.comparingInt(Menu::getSort))
@@ -41,7 +46,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuDao, Menu> implements M
                 .sorted(Comparator.comparingInt(Menu::getSort))
                 .peek((treeEntity) -> treeEntity.setChildren(getChildNode(treeEntity, allListTree)))
                 .collect(Collectors.toList());
-        if(CollectionUtils.isEmpty(collect)){
+        if (CollectionUtils.isEmpty(collect)) {
             return null;
         }
         return collect;