From 73e1d3b046402e3ba6ec20bcd695cbdb7cfef9f1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 20 五月 2022 17:15:11 +0800
Subject: [PATCH] !180 把SysRoleController的remove的@Param岗位id串改成了角色id串 Merge pull request !180 from water/dev

---
 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