From 6381bb6b6422c23ee4801895019f1a432903fbe8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 七月 2025 14:58:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 18ad711..5993a75 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -225,6 +225,19 @@
where u.user_name = #{userName} and u.del_flag = '0'
</select>
+ <select id="selectUserByUserNameByCondition" parameterType="String" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ <where>
+ u.del_flag = '0'
+ <if test="userName != null and userName != ''">
+ AND u.user_name = #{userName}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND u.orgid = #{orgid}
+ </if>
+ </where>
+ </select>
+
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
--
Gitblit v1.9.3