From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012
---
ruoyi-system/src/main/resources/mapper/system/ext/SysDept2Mapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/ext/SysDept2Mapper.xml b/ruoyi-system/src/main/resources/mapper/system/ext/SysDept2Mapper.xml
index 7a12eb3..8be92e7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ext/SysDept2Mapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ext/SysDept2Mapper.xml
@@ -152,6 +152,22 @@
<if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
+ order by d.dept_id
+ limit 1
+ </select>
+
+ <select id="selectDeptByCodeAndType" resultMap="SysDeptResult">
+ <include refid="selectDeptVo"/>
+ where d.del_flag = '0'
+ and d.dept_code = #{deptCode}
+ <if test="orgid != null and orgid != ''">
+ AND d.orgid = #{orgid}
+ </if>
+ <if test="deptType != null and deptType != ''">
+ AND d.dept_type = #{deptType}
+ </if>
+ order by d.dept_id
+ limit 1
</select>
<select id="selectDeptByCodeAndCampus" parameterType="string" resultMap="SysDeptResult">
--
Gitblit v1.9.3