From 400fce2c41aa7b7de0545ae659020b96c8256e91 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 6 Jan 2025 10:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/app/UserDao.xml | 29 ++++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/app/UserDao.xml b/src/main/resources/mapper/app/UserDao.xml
index fa3f38a6..17f4d683 100644
--- a/src/main/resources/mapper/app/UserDao.xml
+++ b/src/main/resources/mapper/app/UserDao.xml
@@ -5,15 +5,16 @@
 
 
     <select id="selectUserPage" resultType="com.sqx.modules.app.entity.UserEntity">
-        select u.*,v.is_vip as member,v.end_time as endTime,v.vip_type as vipType,
+--         select u.*,v.is_vip as member,v.end_time as endTime,v.vip_type as vipType,
+        select u.*,1 as member,
         s.username as sysUserName
         from tb_user u
-        left join user_vip v on v.user_id=u.user_id
+--         left join user_vip v on v.user_id=u.user_id
         left join sys_user s on s.qd_code=u.qd_code
         where s.sys_user_id is null
-        <if test="vipType!=null">
-            and v.vip_type = #{vipType}
-        </if>
+<!--        <if test="vipType!=null">-->
+<!--            and v.vip_type = #{vipType}-->
+<!--        </if>-->
         <if test="search!=null and search!=''">
             and (u.user_id=#{search} or u.phone = #{search} or u.user_name =#{search} )
         </if>
@@ -32,15 +33,15 @@
         <if test="sysPhone!=null and sysPhone!=''">
             and u.sys_phone=#{sysPhone}
         </if>
-        <if test="status!=null and status!=0">
-            and u.status=#{status}
-        </if>
-        <if test="member!=null and member!=-1 and member!=1">
-            and v.is_vip=#{member}
-        </if>
-        <if test="member!=null and member==1">
-            and (v.is_vip=1 or v.is_vip is null)
-        </if>
+<!--        <if test="status!=null and status!=0">-->
+<!--            and u.status=#{status}-->
+<!--        </if>-->
+<!--        <if test="member!=null and member!=-1 and member!=1">-->
+<!--            and v.is_vip=#{member}-->
+<!--        </if>-->
+<!--        <if test="member!=null and member==1">-->
+<!--            and (v.is_vip=1 or v.is_vip is null)-->
+<!--        </if>-->
         <if test="inviterCode!=null and inviterCode!=''">
             and u.inviter_code like concat("%",#{inviterCode},"%")
         </if>