新增菜单上移下移接口

修改菜单查询逻辑

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsMenuController.java

@@ -121,7 +121,7 @@ public class KwsMenuController {
     /**
      * @param  reqVo 入参
      * @return HttpResult
-     * @desc: 移动菜单
+     * @desc: 查子菜单
      * @author: czh
      * @date: 2023/6/13
      */

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/QueryChildMenuReqVo.java

@@ -26,6 +26,6 @@ public class QueryChildMenuReqVo implements Serializable {
     /**
      * 要查询的下级菜单类型  1菜单 2目录
      */
-    private Integer menuType;
+    private Integer type;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -5,8 +5,6 @@ import java.util.Date;
 import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.nacos.api.naming.pojo.healthcheck.impl.Http;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.MenuTypeEnum;
@@ -15,7 +13,6 @@ import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindMenuTreePojo;
@@ -25,7 +22,6 @@ import com.sckw.system.model.vo.req.QueryChildMenuReqVo;
 import com.sckw.system.model.vo.req.RoleBindMenuReqVo;
 import com.sckw.system.model.vo.res.KwsMenuResVo;
 import com.sckw.system.model.vo.res.QueryChildMenuResVo;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,7 +82,7 @@ public class KwsMenuService {
             List<KwsMenu> select = kwsMenuDao.select(kwsMenuParam);
             int sort = 1;
             if (!CollectionUtils.isEmpty(select)) {
-                sort = select.get(select.size()).getSort() + 1;
+                sort = select.get(select.size() - 1).getSort() + 1;
             }
             params.setSort(sort);
         }
@@ -368,7 +364,7 @@ public class KwsMenuService {
     public List<QueryChildMenuResVo> queryChildMenu(QueryChildMenuReqVo reqVo) {
         KwsMenu kwsMenuParam = new KwsMenu();
         kwsMenuParam.setParentId(reqVo.getId());
-        kwsMenuParam.setType(reqVo.getMenuType());
+        kwsMenuParam.setType(reqVo.getType());
         List<KwsMenu> select = kwsMenuDao.select(kwsMenuParam);
         if (CollectionUtils.isEmpty(select)) {
             return Collections.emptyList();

sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

@@ -286,7 +286,7 @@
       </foreach>
     </if>
     <if test="type != null">
-      and sm = #{type}
+      and sm.type = #{type}
     </if>
     ORDER BY sm.level, sm.sort
   </select>