From 965bdc9986ba66b10c2783b514b1cbdd19b29077 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期六, 19 二月 2022 17:08:50 +0800 Subject: [PATCH] !431 修改登录超时刷新页面跳转登录页面还提示重新登录问题 Merge pull request !431 from 也曾为你、像超人/master --- ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index a6e8206..44bd868 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -30,6 +30,9 @@ <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult"> <include refid="selectDeptVo"/> where d.del_flag = '0' + <if test="deptId != null and deptId != 0"> + AND dept_id = #{deptId} + </if> <if test="parentId != null and parentId != 0"> AND parent_id = #{parentId} </if> @@ -44,7 +47,7 @@ order by d.parent_id, d.order_num </select> - <select id="selectDeptListByRoleId" resultType="Integer"> + <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 @@ -140,7 +143,7 @@ </foreach> </update> - <update id="updateDeptStatusNormal" parameterType="Long"> + <update id="updateDeptStatusNormal" parameterType="Long"> update sys_dept set status = '0' where dept_id in <foreach collection="array" item="deptId" open="(" separator="," close=")"> #{deptId} -- Gitblit v1.9.2