From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/OrganizationalMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/OrganizationalMapper.xml b/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
index e0ab681..5fee3e9 100644
--- a/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
+++ b/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
@@ -9,7 +9,10 @@
</resultMap>
<select id="OrganizationalTree" resultMap="OrganizationalMap">
- SELECT o.id, o.`department` FROM organizational o where o.`father_id` = #{father_id}
+ SELECT o.id, o.`department`
+ FROM organizational o
+ where o.`father_id` = #{father_id}
+ and o.state = 1
</select>
<select id="getDepartmentListTable" resultType="map">
@@ -18,4 +21,10 @@
WHERE o.`father_id` = #{departmentId}
AND o.`state` = 1
</select>
+
+ <select id="deleteDepartment">
+ update lims_laboratory.organizational
+ set state=0
+ where id in (${ids})
+ </select>
</mapper>
--
Gitblit v1.9.3