From 27b3352a6a7f514c98cce083eded6c3bb9e3f519 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 一月 2025 10:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/userInfo/User.xml | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/userInfo/User.xml b/north-glass-erp/src/main/resources/mapper/userInfo/User.xml
index 7029b59..62f4a3d 100644
--- a/north-glass-erp/src/main/resources/mapper/userInfo/User.xml
+++ b/north-glass-erp/src/main/resources/mapper/userInfo/User.xml
@@ -29,6 +29,20 @@
on b.role_id = c.id
where state =1 and a.id != 1
</select>
+ <select id="findByAddress" resultMap="findAllMap">
+ SELECT a.*,
+ b.role_id,
+ c.role
+ FROM erp_user_info.user as a
+ left join user_role as b
+ on a.id = b.user_id
+ left join role as c
+ on b.role_id = c.id
+ where state =1 and a.id != 1 and address is not null and address !=''
+ <if test="userName != null and userName != '' and userName != 'null'">
+ and user_name like concat('%',#{userName},'%')
+ </if>
+ </select>
<select id="findOne" >
SELECT *
--
Gitblit v1.8.0