From 59e1a8ff7dfd9af5244ae5448d8af745a9720d13 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 Nov 2023 18:04:34 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
index 12c97b4..314f3e0 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.system.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -79,7 +80,14 @@
if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
parentId = null;
}
- return baseMapper.lazyList(parentId, param);
+ List<MenuVO> menuVOS = baseMapper.lazyList(parentId, param);
+ for (MenuVO menuVO : menuVOS) {
+ if(StringUtils.isNotBlank(menuVO.getLabelStr())){
+ List<List<String>> lists = (List<List<String>>)JSON.parse(menuVO.getLabelStr() );
+ menuVO.setLabelList(lists);
+ }
+ }
+ return menuVOS;
}
@Override
@@ -87,22 +95,19 @@
if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
parentId = null;
}
- return baseMapper.lazyMenuList(parentId, param);
+ List<MenuVO> menuVOS = baseMapper.lazyList(parentId, param);
+ for (MenuVO menuVO : menuVOS) {
+ if(StringUtils.isNotBlank(menuVO.getLabelStr())){
+ List<List<String>> lists = (List<List<String>>)JSON.parse(menuVO.getLabelStr() );
+ menuVO.setLabelList(lists);
+ }
+ }
+ return menuVOS;
}
public static final List<Integer> list1 = Arrays.asList(1, 2, 3, 4, 5, 6, 11, null);
public static final List<Integer> list2 = Arrays.asList(1, 11, null);
- /**
- * apache测试方法
- */
- public static void main(String[] args) {
- System.out.println("交集：" + CollectionUtils.intersection(list1, list2)); // 交集
- System.out.println("补集：" + CollectionUtils.disjunction(list1, list2)); // 补集
- System.out.println("并集：" + CollectionUtils.union(list1, list2)); // 并集
- System.out.println("list1的差集：" + CollectionUtils.subtract(list1, list2)); // list1的差集
- System.out.println("list2的差集：" + CollectionUtils.subtract(list2, list1)); // list2的差集
- }
@Override
public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType) {
@@ -131,6 +136,28 @@
List<Integer> integerList = Arrays.stream(split).map(Integer::valueOf).collect(Collectors.toList());
Collection<? extends Serializable> union = CollectionUtils.intersection(integerList, integers);
if (union.size() == 0) {
+ iterator.remove();
+ }
+ } else {
+ if (next.getName().trim().equals("标签报事")) {
+ iterator.remove();
+ }
+ if (next.getName().trim().equals("取保候审")) {
+ iterator.remove();
+ }
+ if (next.getName().trim().equals("打金店")) {
+ iterator.remove();
+ }
+ if (next.getName().trim().equals("旅馆安全")) {
+ iterator.remove();
+ }
+ if (next.getName().trim().equals("二手车交易")) {
+ iterator.remove();
+ }
+ if (next.getName().trim().equals("二手手机维修")) {
+ iterator.remove();
+ }
+ if (next.getName().trim().equals("校园安全")) {
iterator.remove();
}
}
@@ -315,7 +342,7 @@
}
@Override
- public boolean submit(Menu menu) {
+ public boolean submit(MenuDTO menu) {
LambdaQueryWrapper<Menu> menuQueryWrapper = Wrappers.lambdaQuery();
if (menu.getId() == null) {
menuQueryWrapper.eq(Menu::getCode, menu.getCode()).or(
@@ -341,6 +368,13 @@
throw new ServiceException("父节点只可选择菜单类型!");
}
}
+ menu.setLabelStr(JSON.toJSONString(menu.getLabelList()));
+ List<List<String>> labelList = menu.getLabelList();
+ StringBuffer stringBuffer = new StringBuffer();
+ for (List<String> strings : labelList) {
+ stringBuffer.append(strings.get(strings.size()-1)).append(",");
+ }
+ menu.setLabelId(stringBuffer.toString());
menu.setIsDeleted(BladeConstant.DB_NOT_DELETED);
return saveOrUpdate(menu);
}
--
Gitblit v1.9.3