From 7554bdebc75babe48e42a7663844bbeb1bb4febf Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Fri, 14 Nov 2025 17:02:58 +0800
Subject: [PATCH] =?UTF-8?q?11.11=20sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/cashMapper/CashCollectionMapper.xml  | 26 +++++++++++++---------
 src/main/resources/cashMapper/CashRefundMapper.xml | 18 ++++++++++-----
 src/main/resources/mapper/MarketMapper.xml         | 12 ++++++----
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index ce94b08..e3f6932 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -256,19 +256,25 @@
         where cr.id=#{id}
     </select>
     <select id="selectBatchIds" resultType="com.example.demo.domain.vo.cash.CashCollection">
-        select cr.id,cr.jwcode,cr.name,cr.market,
-        cr.order_code,cr.bank_code,cr.goods_name,cr.good_num,cr.num_unit,cr.permanent_gold,cr.free_gold,
-        cr.payment_currency,cr.payment_amount,cr.received_currency,cr.received_amount,cr.handling_charge,
-        cr.pay_type,cr.received_market,cr.pay_time,cr.received_time,cr.audit_id,cr.status,cr.submitter_id,
-        cr.submitter_market,cr.voucher,cr.remark,cr.audit_time,a1.admin_name as submitterName,
-        a2.admin_name as auditName,ra.activity_name as activity
+        select
+        cr.id, cr.jwcode, cr.name, cr.market,
+        cr.order_code, cr.bank_code, cr.goods_name, cr.good_num, cr.num_unit, cr.permanent_gold, cr.free_gold,
+        cr.payment_currency, cr.payment_amount, cr.received_currency, cr.received_amount, cr.handling_charge,
+        cr.pay_type, cr.received_market, cr.pay_time, cr.received_time, cr.audit_id, cr.status, cr.submitter_id,
+        cr.submitter_market, cr.voucher, cr.remark, cr.audit_time,
+        a1.admin_name as submitterName,
+        a2.admin_name as auditName,
+        ra.activity_name as activity
         from cash_record_collection cr
         left join admin a1 on cr.submitter_id = a1.id
         left join admin a2 on cr.audit_id = a2.id
         left join recharge_activity ra on ra.id = cr.activity
-        where cr.id IN
-        <foreach collection="relatedIds" item="id" open="(" separator="," close=")">
-        #{id}
-        </foreach>
+        where 1 = 0
+        <if test="relatedIds != null and relatedIds.size() > 0">
+            OR cr.id IN
+            <foreach collection="relatedIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 8887167..282c396 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -144,6 +144,7 @@
                     crr.submitter_id,
                     crr.submitter_market,
                     crr.executor,
+                    crr.order_code,
                     crr.refund_channels,
                     crr.refund_time,
                     crr.create_time,
@@ -224,6 +225,7 @@
         crr.name,
         crr.market,
         crc.goods_name,
+        crr.order_code,
         crc.good_num as goodsNum,
         crc.num_unit,
         crr.refund_model,
@@ -308,6 +310,7 @@
         crr.name,
         crr.market,
         crc.goods_name,
+        crc.order_code,
         crc.good_num as goodsNum,
         crc.num_unit,
         crr.refund_model,
@@ -318,6 +321,7 @@
         crr.refund_time,
         crr.status,
         crr.audit_id,
+        crr.submitter_id,
         crr.related_id,
        la.area_servise,
        la.area_finance,
@@ -379,11 +383,15 @@
     </select>
 
     <select id="getAuditBatch" resultType="com.example.demo.domain.vo.cash.LhlAudit">
-        select * from lhl_audit
-        where id in
-        <foreach collection="auditIds" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        SELECT *
+        FROM lhl_audit
+        WHERE 1 = 0
+        <if test="auditIds != null and auditIds.size() > 0">
+            OR id IN
+            <foreach collection="auditIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/MarketMapper.xml b/src/main/resources/mapper/MarketMapper.xml
index 496fe44..d0520e9 100644
--- a/src/main/resources/mapper/MarketMapper.xml
+++ b/src/main/resources/mapper/MarketMapper.xml
@@ -39,9 +39,13 @@
         select name from market where id=#{market}
     </select>
     <select id="getMarketByIds" resultType="com.example.demo.domain.entity.Market">
-        select id,name from market where id in
-        <foreach collection="marketIds" item="marketId" open="(" separator="," close=")">
-            #{marketId}
-        </foreach>
+        select id, name from market
+        where 1 = 0
+        <if test="marketIds != null and marketIds.size() > 0">
+            OR id IN
+            <foreach collection="marketIds" item="marketId" open="(" separator="," close=")">
+                #{marketId}
+            </foreach>
+        </if>
     </select>
 </mapper>
\ No newline at end of file