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 | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 fbddc1a..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
@@ -15,9 +15,6 @@
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
- <if test="p.hospitalId != null and p.hospitalId !=''">
- and hospital_id = #{p.hospitalId}
- </if>
<if test="p.departmentName != null and p.departmentName !=''">
and department_name = #{p.departmentName}
</if>
@@ -54,6 +51,9 @@
<if test="p.updateTime != null and p.updateTime !=''">
and update_time = #{p.updateTime}
</if>
+ <if test="p.accountsCount != null and p.accountsCount !=''">
+ and accounts_count = #{p.accountsCount}
+ </if>
</where>
</sql>
@@ -75,4 +75,14 @@
<include refid="where"/>
order by id desc
</select>
+ <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 is_del=0 and enabled=1
+ </select>
+ <select id="updatePay" resultType="boolean">
+ UPDATE sys_department
+ set is_pay=#{isPay}
+ where id=#{departmentId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0