From f1a4b363c60b9592b1b8807274c35233b1187928 Mon Sep 17 00:00:00 2001
From: 梁剑锋 <1822213252@qq.com>
Date: 星期二, 23 八月 2022 16:16:23 +0800
Subject: [PATCH] !219 修复点击删除后再点取消控制台报错 * 修复点击删除后再点取消控制台报错，并修改样式 * 修复取消控制台报错
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 07fc5d6..00493be 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -22,16 +22,19 @@
<result property="updateTime" column="update_time"/>
</resultMap>
- <select id="selectDeptListByRoleId" resultType="Integer">
+ <select id="selectDeptList" resultMap="SysDeptResult">
+ select * from sys_dept ${ew.getCustomSqlSegment}
+ </select>
+
+ <select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id
from sys_dept d
- left join sys_role_dept rd on d.dept_id = rd.dept_id
+ left join sys_role_dept rd on d.dept_id = rd.dept_id
where rd.role_id = #{roleId}
- <if test="deptCheckStrictly">
- and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
- rd.dept_id and rd.role_id = #{roleId})
- </if>
+ <if test="deptCheckStrictly">
+ and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+ </if>
order by d.parent_id, d.order_num
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3