From aa72a1d1d8c792b322281f5ab01996bc62820b13 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 16 九月 2025 15:31:07 +0800
Subject: [PATCH] 修改bug及数据加密传输

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
index c0afcd5..9963f11 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
@@ -19,9 +19,12 @@
 
 	<select id="selectRoles" resultType="map">
 		select rr.*,(SELECT COUNT(id) from sys_user where FIND_IN_SET(rr.id,roleid)) as userCount
-		from sys_role as rr
-		<if test="condition != null">
-			where rr.name like CONCAT('%',#{condition},'%')
+		from sys_role as rr where 1 = 1
+		<if test="condition != null and condition !=''">
+			and rr.name like CONCAT('%',#{condition},'%')
+		</if>
+		<if test="null != objectId">
+			and rr.objectId = #{objectId}
 		</if>
 	</select>
 
@@ -32,7 +35,7 @@
 	<select id="roleTreeList" resultType="com.stylefeng.guns.core.node.ZTreeNode">
 		select id "id",pId
 		"pId",name as "name",(case when (pId=0 or pId is null) then 'true'
-		else 'false' end) "open" from sys_role
+		else 'false' end) "open" from sys_role where objectId = #{objectId}
 	</select>
 
 	<select id="roleTreeListByRoleId" resultType="com.stylefeng.guns.core.node.ZTreeNode">
@@ -63,14 +66,14 @@
 		ID
 		FROM
 		sys_role
-		WHERE
+		WHERE objectId = #{objectId} and
 		ID IN
 
 		<foreach collection="array" index="index" item="i" open="(" separator="," close=")">
 			#{i}
 		</foreach>
 
-		) r1 ON r.ID = r1.ID
+		) r1 ON r.ID = r1.ID where r.objectId = #{objectId}
 		ORDER BY
 		pId,
 		num ASC

--
Gitblit v1.7.1