From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
index f77a682..6e21fb5 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.SysUserRole2Mapper">
- <resultMap type="SysUserRole" id="SysUserRoleResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id"/>
<result property="roleId" column="role_id"/>
<result property="guid" column="guid"/>
@@ -23,6 +23,15 @@
where role_id = #{roleId}
</select>
+ <select id="selectUserRoleByRoleIdAndUserId" resultMap="SysUserRoleResult">
+ select user_id,role_id,guid,orgid
+ from sys_user_role
+ where 1=1
+ <if test="roleId != null ">and role_id = #{roleId}</if>
+ <if test="userId != null ">and user_id = #{userId}</if>
+
+ </select>
+
<delete id="deleteUserRole" parameterType="Long">
delete from sys_user_role where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
--
Gitblit v1.9.3