From 4809db01709fd66fe3a25452ef41a6378b6ac6c8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 11:18:21 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_cbsglxt
---
src/main/resources/mapper/system/SysDeptMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/system/SysDeptMapper.xml b/src/main/resources/mapper/system/SysDeptMapper.xml
index 5c6310a..aedb633 100644
--- a/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -99,6 +99,7 @@
<if test="phone != null and phone != ''">phone,</if>
<if test="email != null and email != ''">email,</if>
<if test="deptNick != null and deptNick != ''">dept_nick,</if>
+ <if test="tenantId != null and tenantId != ''">tenant_id,</if>
<if test="status != null">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
@@ -112,6 +113,7 @@
<if test="phone != null and phone != ''">#{phone},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="deptNick != null and deptNick != '' ">#{deptNick},</if>
+ <if test="tenantId != null and tenantId != '' ">#{tenantId},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
@@ -130,6 +132,7 @@
<if test="email != null">email = #{email},</if>
<if test="deptNick != null and deptNick != '' ">dept_nick = #{deptNick},</if>
<if test="status != null and status != ''">status = #{status},</if>
+ <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
@@ -178,5 +181,10 @@
FROM DepartmentHierarchy
WHERE parent_id = 100;
</select>
+ <select id="selectDeptByDeptName" resultType="com.ruoyi.project.system.domain.SysDept">
+ <include refid="selectDeptVo"/>
+ WHERE d.dept_name = #{deptName}
+ LIMIT 1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3