From 760f21d416408730b4da2598400c2e16a6ad6895 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 26 十二月 2025 17:33:27 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml | 82 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
index 17deb29..115b08a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
@@ -45,12 +45,13 @@
<select id="promotionPageList" resultType="com.ruoyi.system.vo.PromotionPageListVo">
- select t1.id userId,t1.name userName,t1.phone phone,t1.profile_photo avatar,t1.user_type roleName,t1.status status,
-
- t2.id lastUserId,t2.name lastUserName,t2.phone lastPhone,t2.profile_photo lastAvatar,t2.user_type lastRoleName
+ select * from (
+ select t1.id userId,t1.name userName,t1.phone phone,t1.profile_photo avatar,t1.user_type roleName,t1.status
+ status,
+ t2.id lastUserId,t2.name lastUserName,t2.phone lastPhone,t2.profile_photo lastAvatar,t2.user_type lastRoleName,t1.create_time createTime
from t_app_user t1
left join t_app_user t2 on t1.referrer_user_id =t2.id
- where t1.company_id = #{query.companyId} and t1.status !=3
+ where t1.company_id = #{query.companyId} and t1.status !=3 and t1.referrer_user_id is not null
<if test="query.userName != null and query.userName != ''">
and t1.name like concat('%',#{query.userName},'%')
</if>
@@ -63,15 +64,46 @@
<if test="query.lastPhone != null and query.lastPhone != ''">
and t2.phone like concat('%',#{query.lastPhone},'%')
</if>
- order by t1.create_time desc
+
+ union all
+ select t1.id userId,t1.name userName,t1.phone phone,t1.profile_photo avatar,t1.user_type roleName,t1.status
+ status,
+
+ t2.user_id lastUserId,t2.nick_name lastUserName,t2.phonenumber lastPhone,t2.avatar lastAvatar,
+
+ case
+ when t2.role_type = 2 then 4
+ when t2.role_type = 3 then 5
+ end lastRoleName
+ ,t1.create_time createTime
+
+ from t_app_user t1
+ left join sys_user t2 on t1.referrer_sys_user_id =t2.user_id
+ where t1.company_id = #{query.companyId} and t1.status !=3 and t1.referrer_user_id is null
+ <if test="query.userName != null and query.userName != ''">
+ and t1.name like concat('%',#{query.userName},'%')
+ </if>
+ <if test="query.phone != null and query.phone != ''">
+ and t1.phone like concat('%',#{query.phone},'%')
+ </if>
+ <if test="query.lastUserName != null and query.lastUserName != ''">
+ and t2.nick_name like concat('%',#{query.lastUserName},'%')
+ </if>
+ <if test="query.lastPhone != null and query.lastPhone != ''">
+ and t2.phonenumber like concat('%',#{query.lastPhone},'%')
+ </if>
+
+ ) as t3
+ order by t3.createTime desc
</select>
<select id="promotionPageListExport" resultType="com.ruoyi.system.vo.PromotionPageListVo">
- select t1.id userId,t1.name userName,t1.phone phone,t1.profile_photo avatar,t1.user_type roleName,t1.status status,
-
- t2.id lastUserId,t2.name lastUserName,t2.phone lastPhone,t2.profile_photo lastAvatar,t2.user_type lastRoleName
+ select * from (
+ select t1.id userId,t1.name userName,t1.phone phone,t1.profile_photo avatar,t1.user_type roleName,t1.status
+ status,
+ t2.id lastUserId,t2.name lastUserName,t2.phone lastPhone,t2.profile_photo lastAvatar,t2.user_type lastRoleName,t1.create_time createTime
from t_app_user t1
left join t_app_user t2 on t1.referrer_user_id =t2.id
- where t1.company_id = #{query.companyId} and t1.status !=3
+ where t1.company_id = #{query.companyId} and t1.status !=3 and t1.referrer_user_id is not null
<if test="query.userName != null and query.userName != ''">
and t1.name like concat('%',#{query.userName},'%')
</if>
@@ -84,7 +116,37 @@
<if test="query.lastPhone != null and query.lastPhone != ''">
and t2.phone like concat('%',#{query.lastPhone},'%')
</if>
- order by t1.create_time desc
+
+ union all
+ select t1.id userId,t1.name userName,t1.phone phone,t1.profile_photo avatar,t1.user_type roleName,t1.status
+ status,
+
+ t2.user_id lastUserId,t2.nick_name lastUserName,t2.phonenumber lastPhone,t2.avatar lastAvatar,
+
+ case
+ when t2.role_type = 2 then 4
+ when t2.role_type = 3 then 5
+ end lastRoleName
+ ,t1.create_time createTime
+
+ from t_app_user t1
+ left join sys_user t2 on t1.referrer_sys_user_id =t2.user_id
+ where t1.company_id = #{query.companyId} and t1.status !=3 and t1.referrer_user_id is null
+ <if test="query.userName != null and query.userName != ''">
+ and t1.name like concat('%',#{query.userName},'%')
+ </if>
+ <if test="query.phone != null and query.phone != ''">
+ and t1.phone like concat('%',#{query.phone},'%')
+ </if>
+ <if test="query.lastUserName != null and query.lastUserName != ''">
+ and t2.nick_name like concat('%',#{query.lastUserName},'%')
+ </if>
+ <if test="query.lastPhone != null and query.lastPhone != ''">
+ and t2.phonenumber like concat('%',#{query.lastPhone},'%')
+ </if>
+
+ ) as t3
+ order by t3.createTime desc
</select>
<select id="exportAppUser" resultType="com.ruoyi.system.model.TAppUser">
select t1.* from t_app_user t1
--
Gitblit v1.7.1