From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-system/src/main/resources/mapper/system/UserMapper.xml | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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..b877335 100644
--- a/oying-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/UserMapper.xml
@@ -20,10 +20,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"/>
@@ -41,21 +37,23 @@
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 +70,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 +89,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">
--
Gitblit v1.9.3