From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
index 089aa5e..cebb745 100644
--- a/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
@@ -120,23 +120,28 @@
<select id="selectDeptByCode" parameterType="string" resultMap="SysDeptResult">
select d.dept_id,
- d.parent_id,
- d.type,
- d.dept_code,
- d.dept_type,
- d.ancestors,
- d.dept_name,
- d.order_num,
- d.leader,
- d.phone,
- d.email,
- d.orgid,
- d.his_dept_id,
- d.his_parent_id
- d.status
+ d.parent_id,
+ d.type,
+ d.dept_code,
+ d.dept_type,
+ d.ancestors,
+ d.dept_name,
+ d.order_num,
+ d.leader,
+ d.phone,
+ d.email,
+ d.orgid,
+ d.his_dept_id,
+ d.his_parent_id,
+ d.status
from sys_dept d
where del_flag = 0
- and d.dept_code = #{deptCode}
+ <if test="deptCode != null and deptCode != ''">
+ AND dept_code = #{deptCode}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
</select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int">
@@ -306,7 +311,7 @@
<delete id="deleteDeptById" parameterType="Long">
update sys_dept
- set del_flag = '2'
+ set del_flag = '1'
where dept_id = #{deptId}
</delete>
--
Gitblit v1.9.3