From f14deee7baaf82e7aad6fc81a2509ba88e869afd Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 02 Nov 2020 15:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml
index e7be82d..0766182 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml
@@ -78,7 +78,7 @@
<select id="checkDepartmentName" resultType="string">
SELECT org_name FROM sys_organization
WHERE org_parent_id =( SELECT org_id FROM sys_hospital WHERE id = #{hosId} )
-AND org_name = #{departmentName}
+AND org_name = #{departmentName} AND is_del=0 and enabled=1
</select>
<select id="updatePay" resultType="boolean">
UPDATE sys_department
--
Gitblit v1.8.0