From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/userInfo/User.xml | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 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 a27247d..c10d566 100644
--- a/north-glass-erp/src/main/resources/mapper/userInfo/User.xml
+++ b/north-glass-erp/src/main/resources/mapper/userInfo/User.xml
@@ -7,6 +7,7 @@
<id property="id" column="id"/>
<result property="loginName" column="login_name"/>
<result property="userName" column="user_name"/>
+ <result property="address" column="address"/>
<result property="createTime" column="create_time"/>
<collection property="userRoleList" ofType="com.example.erp.entity.userInfo.UserRole">
@@ -27,6 +28,20 @@
left join role as c
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" >
@@ -78,4 +93,27 @@
set password=#{passWord},update_time=now()
where id=#{id}
</update>
+
+ <update id="updateUserNameById">
+ update erp_user_info.user
+ set user_name=#{userName},update_time=now()
+ where id=#{id}
+ </update>
+ <update id="updateProcessMp">
+ update erp_user_info.user
+ set address=#{process},update_time=now()
+ where id=#{id}
+ </update>
+
+
+ <select id="selectOptimizeParmsById" resultType="String">
+ SELECT optimize_parms FROM erp_user_info.user WHERE user_name = #{username}
+ </select>
+
+ <select id="getUserLog" >
+ SELECT operator_id,operator,DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') AS format_create_time
+ FROM erp_log.log
+ WHERE create_time >= DATE_SUB(NOW(), INTERVAL 1 MONTH) and `function`='鐢ㄦ埛鐧诲綍' order by create_time desc limit 0,100
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0