From f3477f75e63a26613d69b6aa2c8027380f0ccd38 Mon Sep 17 00:00:00 2001
From: otto <731554297@qq.com>
Date: Mon, 03 Jul 2023 11:04:55 +0800
Subject: [PATCH] Merge branch 'master' of gitee.com:OTTTTO/RuoYi-Cloud

---
 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 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 984f89c..000166e 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
@@ -82,7 +82,7 @@
 	
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
 	    <include refid="selectDeptVo"/>
-		where dept_name=#{deptName} and parent_id = #{parentId} limit 1
+		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
     
     <insert id="insertDept" parameterType="SysDept">

--
Gitblit v1.9.3