From eaa3785837a740f1231400a8f790931d6e87185f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 16 Nov 2023 14:37:23 +0800
Subject: [PATCH] 菜单配置标签

---
 src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 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..fc8174b 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,7 +95,14 @@
 		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);
@@ -315,7 +330,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 +356,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(2)).append(",");
+		}
+		menu.setLabelId(stringBuffer.toString());
 		menu.setIsDeleted(BladeConstant.DB_NOT_DELETED);
 		return saveOrUpdate(menu);
 	}

--
Gitblit v1.9.3