From f61888737388259f706dea8173290035c78a4f8b Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 23 Jul 2020 11:46:30 +0800 Subject: [PATCH] 20200723 --- src/main/resources/mapper/modules/ContractOrderMapper.xml | 2 +- src/main/resources/mapper/modules/MemberCoinChargeMapper.xml | 2 +- src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml | 2 +- src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml | 2 +- src/main/resources/mapper/modules/MemberMapper.xml | 2 +- src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml b/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml index fdad905..36d8878 100644 --- a/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml +++ b/src/main/resources/mapper/modules/ContractHoldOrderEntityMapper.xml @@ -53,7 +53,7 @@ contract_hold_order s LEFT JOIN member m ON m.id = s.member_id <where> - (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id != 10) + (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) <if test="record != null" > <if test="record.account!=null and record.account!=''"> and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account}) diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml index 7e2cdf9..0d65652 100644 --- a/src/main/resources/mapper/modules/ContractOrderMapper.xml +++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml @@ -81,7 +81,7 @@ LEFT JOIN member m ON m.id = s.member_id <where> s.closing_type in (2,3,4,5,6,7,8,9) - and (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id != 10) + and (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) <if test="record != null" > <if test="record.account!=null and record.account!=''"> and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account}) diff --git a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml index 5926ea0..a922e2a 100644 --- a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml +++ b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml @@ -73,7 +73,7 @@ LEFT JOIN member m ON m.id = s.member_id <where> s.type = 3 - and (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id != 10) + and (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) and s.content like '%佣金到账%' <if test="record != null" > <if test="record.account!=null and record.account!=''"> diff --git a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml index e590317..f01fba9 100644 --- a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml +++ b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml @@ -39,7 +39,7 @@ <select id="findMemberApplyCoinAloneTestInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinChargeVo"> select * from member_coin_charge s left join member m on m.id = s.member_id <where> - (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id = 10) + (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) <if test="record != null" > <if test="record.account!=null and record.account!=''"> and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account}) diff --git a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml index 0c50e85..0c60cd1 100644 --- a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml +++ b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml @@ -54,7 +54,7 @@ FROM member_coin_withdraw s left join member m on m.id = s.member_id <where> - (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id = 10) + (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) <if test="record != null" > <if test="record.account!=null and record.account!=''"> and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account}) diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml index 18c1cde..ba5de6a 100644 --- a/src/main/resources/mapper/modules/MemberMapper.xml +++ b/src/main/resources/mapper/modules/MemberMapper.xml @@ -157,7 +157,7 @@ LEFT JOIN member_wallet_contract a ON a.member_id = m.id <where> b.wallet_code = 'USDT' - and (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id != 10) + and (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id != 10) <if test="record.account!=null and record.account!=''"> and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account}) </if> -- Gitblit v1.9.1