From b60fa5c920b5eb7cf4a2e3e1cacfe779d2f9ff12 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 12 Feb 2022 14:01:41 +0800
Subject: [PATCH] !144 删除方法无返回值时，方法注释上的@return Merge pull request !144 from 我的世界有我/master
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index e3930a9..3f40fb1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-modules/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>
@@ -66,14 +69,14 @@
<select id="hasChildByDeptId" parameterType="Long" resultType="int">
select count(1) from sys_dept
- where del_flag = '0' and parent_id = #{deptId}
+ where del_flag = '0' and parent_id = #{deptId} limit 1
</select>
<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
select * from sys_dept where find_in_set(#{deptId}, ancestors)
</select>
- <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="java.lang.Integer">
+ <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
</select>
--
Gitblit v1.9.3