From 5f0481c0676f03586db080a0f80448624ad0b8c9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 18 三月 2022 01:53:38 +0800
Subject: [PATCH] !157 修复执行"查询当前数据库类型"后未关闭数据库链接，导致当前连接池中活跃连接数达到最大连接数的bug Merge pull request !157 from KonBAI/close_dataSource_conn
---
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 9362ebc..dc54c7e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -39,12 +39,22 @@
left join sys_dept d on u.dept_id = d.dept_id
</sql>
+ <select id="selectPageRoleList" resultMap="SysRoleResult">
+ <include refid="selectRoleVo"/>
+ ${ew.getCustomSqlSegment}
+ </select>
+
+ <select id="selectRoleList" resultMap="SysRoleResult">
+ <include refid="selectRoleVo"/>
+ ${ew.getCustomSqlSegment}
+ </select>
+
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
WHERE r.del_flag = '0' and ur.user_id = #{userId}
</select>
- <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
+ <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
select r.role_id
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
@@ -57,4 +67,4 @@
WHERE r.del_flag = '0' and u.user_name = #{userName}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3