From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/resources/mapper/system/UserMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/system/UserMapper.xml b/oying-system/src/main/resources/mapper/system/UserMapper.xml
index b877335..c6a3a84 100644
--- a/oying-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/UserMapper.xml
@@ -6,6 +6,7 @@
<result column="user_username" property="username"/>
<result column="user_user_type" property="userType"/>
<result column="user_openid" property="openid"/>
+ <result column="user_rider_open_id" property="riderOpenId"/>
<result column="user_nick_name" property="nickName"/>
<result column="user_email" property="email"/>
<result column="user_phone" property="phone"/>
@@ -30,7 +31,7 @@
<sql id="Base_Column_List">
u.user_id as user_user_id, u.username as user_username,
- u.user_type as user_user_type,u.openid as user_openid,
+ u.user_type as user_user_type,u.openid as user_openid,u.rider_open_id as user_rider_open_id,
u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone,
u.gender as user_gender, u.avatar_name as user_avatar_name, u.avatar_path as user_avatar_path,
u.enabled as user_enabled, u.pwd_reset_time as user_pwd_reset_time, u.create_by as user_create_by,
@@ -108,6 +109,14 @@
where u.openid = #{openid}
</select>
+ <select id="findByRiderOpenId" resultMap="BaseResultMap">
+ select
+ u.password user_password, u.is_admin user_is_admin,
+ <include refid="Base_Column_List"/>
+ from sys_user u
+ where u.rider_open_id = #{riderOpenId}
+ </select>
+
<select id="findByEmail" resultType="com.oying.modules.system.domain.User">
select user_id as id, username from sys_user
where email = #{email}
--
Gitblit v1.9.3