From 5e57de9b12ee136e45ce5754c7fe2e7eb12af05a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 12 Jun 2026 18:35:45 +0800
Subject: [PATCH] 1

---
 trading-order-sys/src/main/resources/mapper/SysMenuMapper.xml |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/trading-order-sys/src/main/resources/mapper/SysMenuMapper.xml b/trading-order-sys/src/main/resources/mapper/SysMenuMapper.xml
index fe7597e..b995252 100644
--- a/trading-order-sys/src/main/resources/mapper/SysMenuMapper.xml
+++ b/trading-order-sys/src/main/resources/mapper/SysMenuMapper.xml
@@ -5,7 +5,8 @@
 
 	<select id="listMenuIdByRoleId" resultType="Long">
 			SELECT sm.menu_id  FROM tz_sys_role_menu rm LEFT JOIN
-  tz_sys_menu sm  ON  rm.menu_id=sm.menu_id   WHERE sm.app_type=#{appType} AND rm.role_id=#{roleId}
+  tz_sys_menu sm  ON  rm.menu_id=sm.menu_id   WHERE rm.role_id=#{roleId}
+  AND (sm.app_type = #{appType} OR FIND_IN_SET(#{appType}, REPLACE(sm.app_type, ' ', '')) OR sm.app_type IS NULL OR sm.app_type = '')
 	</select>
 
 	<!-- 查询用户的所有菜单 -->
@@ -15,7 +16,7 @@
 		WHERE  ur.user_id = #{userId} and m.type != 2
 		
 		<if test="appType!=null and appType!='' ">
-			AND  app_type=#{appType}
+			AND (m.app_type = #{appType} OR FIND_IN_SET(#{appType}, REPLACE(m.app_type, ' ', '')) OR m.app_type IS NULL OR m.app_type = '')
 		</if>
 
 		order by order_num
@@ -24,7 +25,7 @@
 	<select id="listMenu" resultType="com.yami.trading.sys.model.SysMenu">
 		select * from tz_sys_menu where `type` != 2
 		<if test="appType!=null and appType!='' ">
-			AND  app_type=#{appType}
+			AND (app_type = #{appType} OR FIND_IN_SET(#{appType}, REPLACE(app_type, ' ', '')) OR app_type IS NULL OR app_type = '')
 		</if>
 		order by order_num
 	</select>
@@ -33,7 +34,7 @@
 		select menu_id ,parent_id ,`name` from tz_sys_menu where `type` != 2
 
 		<if test="appType!=null and appType!='' ">
-			AND  app_type=#{appType}
+			AND (app_type = #{appType} OR FIND_IN_SET(#{appType}, REPLACE(app_type, ' ', '')) OR app_type IS NULL OR app_type = '')
 		</if>
 
 		order by order_num
@@ -50,16 +51,16 @@
 	<select id="listMenuAndBtn" resultType="com.yami.trading.sys.model.SysMenu">
 	   select * from tz_sys_menu where
 	    1=1
-	     <if test="appType!=null and appType!='' ">
-			 AND  app_type=#{appType}
-		 </if>
+		<if test="appType!=null and appType!='' ">
+			AND (app_type = #{appType} OR FIND_IN_SET(#{appType}, REPLACE(app_type, ' ', '')) OR app_type IS NULL OR app_type = '')
+		</if>
 	    order by order_num
 	</select>
 
 	<!-- 查询用户的所有菜单 -->
 	<select id="listMenuByUserId2" resultType="com.yami.trading.sys.model.SysMenu">
 		SELECT DISTINCT m.menu_id AS menu_id,m.parent_id,m.app_type,m.name,url,m.type,m.icon,m.order_num FROM tz_sys_menu m where 1=1
-		<if test="appType!=null and appType!='' ">AND app_type=#{appType}</if>
+		<if test="appType!=null and appType!='' ">AND (app_type = #{appType} OR FIND_IN_SET(#{appType}, REPLACE(app_type, ' ', '')) OR app_type IS NULL OR app_type = '')</if>
 		<if test="children != null and children.size()>0">and m.menu_id in
 			<foreach collection="children" item="item" index="index" open="(" close=")" separator=",">#{item}</foreach>
 		</if>

--
Gitblit v1.9.3