czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
Tankaikai
2025-01-06 10:08:38 +08:00
parent 98182fec9d 400fce2c41
commit f9e32bff7b
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/resources/mapper/app/UserDao.xml
View File

@@ -5,15 +5,16 @@
<select id="selectUserPage" resultType="com.sqx.modules.app.entity.UserEntity"> <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 s.username as sysUserName
from tb_user u 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 left join sys_user s on s.qd_code=u.qd_code
where s.sys_user_id is null where s.sys_user_id is null
<if test="vipType!=null"> <!-- <if test="vipType!=null">-->
and v.vip_type = #{vipType} <!-- and v.vip_type = #{vipType}-->
</if> <!-- </if>-->
<if test="search!=null and search!=''"> <if test="search!=null and search!=''">
and (u.user_id=#{search} or u.phone = #{search} or u.user_name =#{search} ) and (u.user_id=#{search} or u.phone = #{search} or u.user_name =#{search} )
</if> </if>
@@ -32,15 +33,15 @@
<if test="sysPhone!=null and sysPhone!=''"> <if test="sysPhone!=null and sysPhone!=''">
and u.sys_phone=#{sysPhone} and u.sys_phone=#{sysPhone}
</if> </if>
<if test="status!=null and status!=0"> <!-- <if test="status!=null and status!=0">-->
and u.status=#{status} <!-- and u.status=#{status}-->
</if> <!-- </if>-->
<if test="member!=null and member!=-1 and member!=1"> <!-- <if test="member!=null and member!=-1 and member!=1">-->
and v.is_vip=#{member} <!-- and v.is_vip=#{member}-->
</if> <!-- </if>-->
<if test="member!=null and member==1"> <!-- <if test="member!=null and member==1">-->
and (v.is_vip=1 or v.is_vip is null) <!-- and (v.is_vip=1 or v.is_vip is null)-->
</if> <!-- </if>-->
<if test="inviterCode!=null and inviterCode!=''"> <if test="inviterCode!=null and inviterCode!=''">
and u.inviter_code like concat("%",#{inviterCode},"%") and u.inviter_code like concat("%",#{inviterCode},"%")
</if> </if>