From d4488a987cccd3ddd51a202a9f8aa71d3cdcbced Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Apr 2021 17:12:16 +0800
Subject: [PATCH] 20210423

---
 src/main/resources/mapper/system/UserMapper.xml |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml
index 96e72c1..eac1072 100644
--- a/src/main/resources/mapper/system/UserMapper.xml
+++ b/src/main/resources/mapper/system/UserMapper.xml
@@ -175,9 +175,9 @@
             a.create_time,
             a.status,
             b.return_ratio,
-            c.phone telphone,
-            c.email,
+            a.mobile telphone,
             c.referer_id refererId,
+            c.account_status accountStatus,
             c.certify_status
         from t_user a
         inner join agent_friend_relation b on a.user_id = b.user_id
@@ -187,6 +187,24 @@
                 <if test="record.refererId!=null and record.refererId!=''">
                     find_in_set(#{record.refererId}, b.referer_ids)
                 </if>
+                <if test="record.startTime!=null and record.startTime!=''">
+                    and c.create_time >= #{record.startDate}
+                </if>
+                <if test="record.endTime!=null and record.endTime!=''">
+                    and #{record.endDate} >= c.create_time
+                </if>
+                <if test="record.account!=null and record.account!=''">
+                    and (c.phone = #{record.account} or c.email = #{record.account} or c.invite_id=#{record.account})
+                </if>
+                <if test="record.accountStatus != null and record.accountStatus!=''  or record.accountStatus == 0" >
+                    and c.account_status = #{record.accountStatus}
+                </if>
+                <if test="record.accountType != null and record.accountType!=''" >
+                    and c.account_type = #{record.accountType}
+                </if>
+                <if test="record.certifyStatus!=null and record.certifyStatus!=''and record.certifyStatus!='6' ">
+                    and c.certify_status = #{record.certifyStatus}
+                </if>
             </where>
         </if>
     </select>
@@ -194,4 +212,17 @@
     <select id="selectUserByInviteId" resultType="user">
         select * from t_user where invite_id=#{inviteId}
     </select>
+
+    <select id="selectUserInfoById" resultType="user">
+        select
+            a.user_id,
+            a.agent_name,
+            a.username,
+            a.mobile,
+            a.invite_id,
+            b.return_ratio
+        from t_user a
+        left join agent_friend_relation b on a.user_id=b.user_id
+        where a.user_id=#{id}
+    </select>
 </mapper>

--
Gitblit v1.9.1