From acd3709baabf7ab1e804dc8859cb0a6dab7ee4fb Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Fri, 24 Oct 2025 22:27:03 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E9=94=80=E5=94=AE=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E8=AE=A2=E5=8D=95=E6=8A=A5=E9=94=99BUG=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/xkt/mapper/StoreSaleMapper.java    | 11 +++++------
 .../ruoyi/xkt/service/impl/StoreSaleServiceImpl.java  |  4 ++--
 xkt/src/main/resources/mapper/StoreSaleMapper.xml     | 10 ++++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java
index 321c3fae4..c8a39f25a 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java
@@ -6,9 +6,7 @@ import com.ruoyi.xkt.dto.storeSale.StoreSaleDownloadDTO;
 import com.ruoyi.xkt.dto.storeSale.StoreSaleExportDTO;
 import com.ruoyi.xkt.dto.storeSale.StoreSalePageDTO;
 import com.ruoyi.xkt.dto.storeSale.StoreSalePageResDTO;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,24 +19,25 @@ public interface StoreSaleMapper extends BaseMapper<StoreSale> {
 
     /**
      * 分页
+     *
      * @param pageDTO 入参
-     * @return
+     * @return List<StoreSalePageResDTO>
      */
     List<StoreSalePageResDTO> selectPage(StoreSalePageDTO pageDTO);
 
     /**
      * 导出指定id列表
      *
-     * @param storeSaleIdList 导出入参
+     * @param exportDTO 导出入参
      * @return List<StoreSaleDownloadDTO>
      */
-    List<StoreSaleDownloadDTO> selectExportList(@Param("storeSaleIdList") List<Long> storeSaleIdList);
+    List<StoreSaleDownloadDTO> selectExportList(StoreSaleExportDTO exportDTO);
 
     /**
      * 导出指定时间段内的数据
      *
      * @param exportDTO 导出入参
-     * @return
+     * @return List<StoreSaleDownloadDTO>
      */
     List<StoreSaleDownloadDTO> selectExportListVoucherDateBetween(StoreSaleExportDTO exportDTO);
 
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java
index eb5ed3149..7b1cfb0ef 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java
@@ -213,10 +213,10 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
         if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(exportDTO.getStoreId())) {
             throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR);
         }
-        List<StoreSaleDownloadDTO> downloadList = new ArrayList<>();
+        List<StoreSaleDownloadDTO> downloadList;
         // 导出指定销售出库单
         if (CollectionUtils.isNotEmpty(exportDTO.getStoreSaleIdList())) {
-            downloadList = this.storeSaleMapper.selectExportList(exportDTO.getStoreSaleIdList());
+            downloadList = this.storeSaleMapper.selectExportList(exportDTO);
         } else {
             // 没有传时间，则设置当前时间往前推半年
             if (ObjectUtils.isEmpty(exportDTO.getVoucherDateStart()) && ObjectUtils.isEmpty(exportDTO.getVoucherDateEnd())) {
diff --git a/xkt/src/main/resources/mapper/StoreSaleMapper.xml b/xkt/src/main/resources/mapper/StoreSaleMapper.xml
index d272ea5fd..d3ddec9a9 100644
--- a/xkt/src/main/resources/mapper/StoreSaleMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreSaleMapper.xml
@@ -41,10 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             ss.del_flag = 0
             AND ss.store_id = #{storeId}
-            AND ss.id IN
-            <foreach collection="storeSaleIdList" item="storeSaleId" open="(" separator="," close=")">
-                #{storeSaleId}
-            </foreach>
+            <if test="storeSaleIdList != null and storeSaleIdList.size() > 0">
+                AND ss.id IN
+                <foreach collection="storeSaleIdList" item="storeSaleId" open="(" separator="," close=")">
+                    #{storeSaleId}
+                </foreach>
+            </if>
         ORDER BY
             ss.create_time DESC
     </select>