From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面:月度统计时间调整为上月26到本月25;班次支持右键添加批注 2.外购下单:KJNS域订单免检自动更新批次属性;外购下单-全部页新增【更新IFS批次属性】按钮,支持更新已提交订单的批次属性 3.资源要求-设备:设备核查计划:核查负责人回显问题修复;设备使用授权:检验项目导出数据错误问题修复

---
 ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index cb60a85..72e5b85 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -8,27 +8,48 @@
 		<result property="roleId"     column="role_id"      />
 		<result property="menuId"     column="menu_id"      />
 	</resultMap>
-	
+
 	<select id="checkMenuExistRole" resultType="Integer">
 	    select count(1) from sys_role_menu where menu_id = #{menuId}
 	</select>
 
-	<delete id="deleteRoleMenuByRoleId" parameterType="Long">
+	<!-- 鏍规嵁鏉冮檺鏍囪瘑鍜岀敤鎴穒d鏌ヨ鏉冮檺 -->
+    <select id="selectRoleMenu" resultType="com.ruoyi.system.domain.vo.SysRoleVo">
+		select sm.perms,
+			   sm.menu_name,
+			   srm.is_rersonal
+		from sys_role_menu srm
+				 left join sys_menu sm on sm.menu_id = srm.menu_id
+				 left join sys_user_role sur on srm.role_id = sur.role_id
+		where sm.perms = #{permsName}
+		  and sur.user_id = #{userId}
+		group by sm.menu_id
+	</select>
+
+	<!-- 鏌ヨ鍙湅鎴戣彍鍗昳d -->
+    <select id="selectIsRersonalMenu" resultType="java.lang.Long">
+		select menu_id
+		from sys_role_menu
+		where role_id = #{roleId}
+		and is_rersonal = 1
+	</select>
+
+    <delete id="deleteRoleMenuByRoleId" parameterType="Long">
 		delete from sys_role_menu where role_id=#{roleId}
 	</delete>
-	
+
 	<delete id="deleteRoleMenu" parameterType="Long">
  		delete from sys_role_menu where role_id in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
+
 	<insert id="batchRoleMenu">
-		insert into sys_role_menu(role_id, menu_id) values
+		insert into sys_role_menu(role_id, menu_id, is_rersonal) values
 		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.roleId},#{item.menuId})
+			(#{item.roleId},#{item.menuId},#{item.isRersonal})
 		</foreach>
 	</insert>
-	
-</mapper> 
\ No newline at end of file
+
+</mapper>

--
Gitblit v1.9.3