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/SysUserDeptMapper.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 4795ebc..88c3340 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -82,6 +82,17 @@
where id = #{id}
</select>
+ <select id="selectSysUserDeptByUserAndCode" resultMap="SysUserDeptResult">
+ <include refid="selectSysUserDeptVo"/>
+ where user_id = #{userId}
+ and dept_code = #{deptCode}
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ order by del_flag asc, id asc
+ limit 1
+ </select>
+
<insert id="insertSysUserDept" parameterType="com.ruoyi.common.core.domain.entity.SysUserDept"
useGeneratedKeys="true" keyProperty="id">
insert into sys_user_dept
--
Gitblit v1.9.3