From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysMenuMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysMenuMapper.xml
index 75db7c8..eb18cf3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysMenuMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysMenuMapper.xml
@@ -152,7 +152,7 @@
 			update_by  updateBy,
 			update_time updateTime,
 			remark
- from sys_menu
+ from sys_menu where role_type = 1
 		order by create_time desc
 	</select>
     <select id="getAllInIds" resultType="com.ruoyi.system.domain.SysMenus">
@@ -201,7 +201,7 @@
 			update_by  updateBy,
 			update_time updateTime,
 			remark
- from sys_menu where menu_id !=1074 and  menu_id !=1075 and  menu_id !=1193 and  menu_id !=1194
+ from sys_menu where role_type = #{roleType}
                order by create_time desc
 	</select>
 

--
Gitblit v1.7.1