From be2e1f6efb67f481be39384dc2dc4a8f9e9d4bf5 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 29 Oct 2022 23:16:47 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/dapp/DappMemberDao.xml |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 6ce2b90..5eeeb2f 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -14,22 +14,26 @@
     </select>
 
     <select id="selectInPage" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
-        select * from dapp_member
+        select * from dapp_member a
         <where>
-            <if test="record.currentUser != null">
-                and referer_id = (select invite_id from dapp_user_member_relate where user_id=#{record.currentUser})
+<!--            <if test="record.currentUser != null">-->
+<!--                and referer_id = (select invite_id from dapp_user_member_relate where user_id=#{record.currentUser})-->
+<!--            </if>-->
+
+            <if test="record.description!=null and record.description!=''">
+                and a.id in (select id from dapp_member where FIND_IN_SET(#{record.description}, referer_ids))
             </if>
             <if test="record.accountStatus != null">
-                and account_status = #{record.accountStatus}
+                and a.account_status = #{record.accountStatus}
             </if>
             <if test="record.changeAble != null">
-                and change_able = #{record.changeAble}
+                and a.change_able = #{record.changeAble}
             </if>
             <if test="record.withdrawAble != null">
-                and withdraw_able = #{record.withdrawAble}
+                and a.withdraw_able = #{record.withdrawAble}
             </if>
             <if test="record.inviteId != null and record.inviteId != ''">
-                and invite_id = #{record.inviteId}
+                and a.invite_id = #{record.inviteId}
             </if>
         </where>
         order by create_time desc
@@ -230,4 +234,15 @@
           and b.identity = #{identity}
 
     </select>
+
+    <select id="getAppVersionListInPage" resultType="cc.mrbird.febs.dapp.entity.AppVersion">
+        select a.* from app_version a
+    </select>
+
+    <select id="getChargeListInPage" resultType="cc.mrbird.febs.dapp.entity.MemberCoinChargeEntity">
+        select
+               a.*,b.username username
+        from member_coin_charge a
+        inner join dapp_member b on b.id = a.member_id
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1