From 875be114d48b0591186030819233fdcc20a8cd0a Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期四, 20 七月 2023 14:09:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index b926374..dac120f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -17,6 +17,7 @@
package com.vci.ubcs.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.system.cache.SysCache;
@@ -31,8 +32,11 @@
import com.vci.ubcs.system.wrapper.MenuWrapper;
import lombok.AllArgsConstructor;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.node.TreeNode;
@@ -73,11 +77,11 @@
}
@Override
- public List<MenuVO> lazyMenuList(Long parentId, Map<String, Object> param) {
+ public IPage<MenuVO> lazyMenuPage(Long parentId, Map<String, Object> param, Query query) {
if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
parentId = null;
}
- return baseMapper.lazyMenuList(parentId, param);
+ return baseMapper.lazyMenuPage(parentId, param, Condition.getPage(query));
}
@@ -294,4 +298,25 @@
return saveOrUpdate(menu);
}
+ @Override
+ public List<Menu> getMenuButtonByType(String btmType) {
+ return baseMapper.selectMenuChildByBtnType(btmType);
+ }
+
+ /**
+ * 瀵筀eepAlive鍊艰浆鎹㈡垚甯冨皵绫诲瀷杩涜灏佽
+ *
+ * @param childMenu
+ * @return
+ */
+ @Override
+ public void handleKeepAlive(List<MenuVO> childMenu) {
+ childMenu.forEach(list->{
+ list.getMeta().put("keepAlive","true".equals(list.getKeepAlive()));
+ if(list.getChildren().size()>0){
+ handleKeepAlive(list.getChildren());
+ }
+ });
+ }
+
}
--
Gitblit v1.9.3