From f2fdc4a1e311bafd1dadf45f043bc9c5c77e0a23 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 17:44:56 +0800
Subject: [PATCH] 用户地址距离
---
oying-system/src/main/resources/mapper/system/UserMapper.xml | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/system/UserMapper.xml b/oying-system/src/main/resources/mapper/system/UserMapper.xml
index a71ec72..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"/>
@@ -20,10 +21,6 @@
<result column="user_update_by" property="updateBy"/>
<result column="user_create_time" property="createTime"/>
<result column="user_update_time" property="updateTime"/>
- <collection property="jobs" ofType="com.oying.modules.system.domain.Job">
- <id column="job_id" property="id"/>
- <result column="job_name" property="name"/>
- </collection>
<collection property="roles" ofType="com.oying.modules.system.domain.Role">
<id column="role_id" property="id"/>
<result column="role_name" property="name"/>
@@ -34,28 +31,30 @@
<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,
u.update_by as user_update_by, u.create_time as user_create_time, u.update_time as user_update_time
</sql>
- <sql id="Job_Column_List">
- j.job_id as job_id, j.name as job_name
- </sql>
-
<sql id="Role_Column_List">
r.role_id as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope
</sql>
- <sql id="Whrer_Sql">
+ <sql id="Where_Sql">
<where>
<if test="criteria.id != null">
and u.user_id = #{criteria.id}
</if>
<if test="criteria.enabled != null">
and u.enabled = #{criteria.enabled}
+ </if>
+ <if test="criteria.userTypes != null and criteria.userTypes.size() != 0">
+ and u.user_type in
+ <foreach collection="criteria.userTypes" item="userType" open="(" separator="," close=")">
+ #{userType}
+ </foreach>
</if>
<if test="criteria.blurry != null and criteria.blurry != ''">
and (
@@ -72,20 +71,17 @@
<select id="findAll" resultMap="BaseResultMap">
select u.*,
- <include refid="Job_Column_List"/>,
<include refid="Role_Column_List"/>
from (
select
<include refid="Base_Column_List"/>
from sys_user u
- <include refid="Whrer_Sql"/>
+ <include refid="Where_Sql"/>
order by u.user_id desc
<if test="criteria.offset != null">
limit #{criteria.offset}, #{criteria.size}
</if>
) u
- left join sys_users_jobs suj on u.user_user_id = suj.user_id
- left join sys_job j on suj.job_id = j.job_id
left join sys_users_roles sur on u.user_user_id = sur.user_id
left join sys_role r on sur.role_id = r.role_id
order by u.user_user_id desc
@@ -94,7 +90,7 @@
<select id="countAll" resultType="java.lang.Long">
select count(*)
from sys_user u
- <include refid="Whrer_Sql"/>
+ <include refid="Where_Sql"/>
</select>
<select id="findByUsername" resultMap="BaseResultMap">
@@ -113,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