From 146edfb05602373ad5b36771e1ede1e395d8ab62 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 27 二月 2025 14:53:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr

---
 ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index 2f71cd4..72e5b85 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -26,6 +26,14 @@
 		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>
@@ -38,9 +46,9 @@
  	</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>
 

--
Gitblit v1.9.3