修复菜单查询的bug

guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/MenuService.java

@@ -2,12 +2,12 @@ package cn.stylefeng.guns.sys.modular.system.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
-import cn.stylefeng.guns.sys.core.constant.state.MenuStatus;
-import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.guns.base.pojo.node.MenuNode;
 import cn.stylefeng.guns.base.pojo.node.ZTreeNode;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
+import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
+import cn.stylefeng.guns.sys.core.constant.state.MenuStatus;
+import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.guns.sys.core.listener.ConfigListener;
 import cn.stylefeng.guns.sys.modular.system.entity.Menu;
 import cn.stylefeng.guns.sys.modular.system.mapper.MenuMapper;
@@ -320,13 +320,23 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> {
             maps = new ArrayList<>();
         }
 
+        //修复菜单查询bug，带条件的暂时先父级置为0
+        if (ToolUtil.isNotEmpty(condition) || ToolUtil.isNotEmpty(level)) {
+            if (maps.size() > 0) {
+
+                //将pcode置为root
+                for (Map<String, Object> menu : maps) {
+                    menu.put("pcode", "0");
+                }
+            }
+        }
+
         //创建根节点
         Menu menu = new Menu();
         menu.setMenuId(-1L);
         menu.setName("根节点");
         menu.setCode("0");
         menu.setPcode("-2");
-
         maps.add(BeanUtil.beanToMap(menu));
 
         return maps;

guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/warpper/MenuWrapper.java

@@ -18,7 +18,6 @@ package cn.stylefeng.guns.sys.modular.system.warpper;
 import cn.stylefeng.guns.sys.core.constant.factory.ConstantFactory;
 import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
 import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
-import cn.stylefeng.roses.kernel.model.page.PageResult;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
@@ -32,10 +31,6 @@ import java.util.Map;
  */
 public class MenuWrapper extends BaseControllerWrapper {
 
-    public MenuWrapper(Map<String, Object> single) {
-        super(single);
-    }
-
     public MenuWrapper(List<Map<String, Object>> multi) {
         super(multi);
     }
@@ -44,17 +39,13 @@ public class MenuWrapper extends BaseControllerWrapper {
         super(page);
     }
 
-    public MenuWrapper(PageResult<Map<String, Object>> pageResult) {
-        super(pageResult);
-    }
-
     @Override
     protected void wrapTheMap(Map<String, Object> map) {
         map.put("statusName", ConstantFactory.me().getMenuStatusName((String) map.get("status")));
 
         String menuFlag = (String) map.get("menuFlag");
         for (YesOrNotEnum value : YesOrNotEnum.values()) {
-            if(value.name().equals(menuFlag)){
+            if (value.name().equals(menuFlag)) {
                 map.put("isMenuName", value.getDesc());
             }
         }