From 158ac9bdc5d184a4dca8ff30755186f5ca2db771 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 30 十月 2023 11:58:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
index 64bfdc7..84efde9 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
@@ -17,6 +17,7 @@
 package com.vci.ubcs.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.node.TreeNode;
 import com.vci.ubcs.system.dto.MenuDTO;
 import com.vci.ubcs.system.entity.Menu;
@@ -49,7 +50,7 @@
 	 * @param param
 	 * @return
 	 */
-	List<MenuVO> lazyMenuList(Long parentId, Map<String, Object> param);
+	IPage<MenuVO> lazyMenuPage(Long parentId, Map<String, Object> param, IPage page);
 
 	/**
 	 * 鏍戝舰缁撴瀯
@@ -126,6 +127,13 @@
 	List<Menu> allMenu();
 
 	/**
+	 * 鏍规嵁涓氬姟绫诲瀷鏌ヨ鑿滃崟鐨勫瓙鎸夐挳
+	 *
+	 * @return
+	 */
+	List<Menu> selectMenuChildByBtnType(String btmType,List<String> roleIds);
+
+	/**
 	 * 鏉冮檺閰嶇疆鑿滃崟
 	 *
 	 * @param roleId

--
Gitblit v1.9.3