From bf1df93b1fe5a45a677c5e8ef6a50d1210b6c8d5 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 3 Nov 2025 18:29:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E8=A1=A8=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/supermarket/controller/ReportController.java    | 1 +
 .../src/main/resources/mapper/InventoryReportMapper.xml     | 6 +++---
 .../src/main/resources/mapper/SalesReportMapper.xml         | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ReportController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ReportController.java
index 00f6cc9c0..17e5aabfc 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ReportController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/ReportController.java
@@ -162,6 +162,7 @@ public class ReportController {
     public List<InventoryReportExcelDTO> exportInventoryReport(
             @Parameter(description = "查询条件") @ParameterObject InventoryReportQueryDTO queryDTO) {
         log.info("开始导出进销存报表，查询条件：{}", queryDTO);
+        log.info("开始导出进销存报表，查询条件：{}", queryDTO);
         List<InventoryReportExcelDTO> list = inventoryReportService.exportExcel(queryDTO);
         log.info("导出进销存报表成功，导出记录数：{}", list.size());
         return list;
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml
index 20133f11b..772705f26 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/InventoryReportMapper.xml
@@ -50,6 +50,8 @@
             spu.id AS product_id,
             spu.product_code,
             spu.product_name,
+            spu.dept_id,
+            spu.create_by,
             cat.name AS category_name,
             base.spec AS spec,
             base.unit AS unit,
@@ -165,9 +167,7 @@
             <if test="param.supplierId != null">
                 AND r.supplier_id = #{param.supplierId}
             </if>
-            <if test="dataScope != null">
-                ${dataScope.sqlFilter}
-            </if>
+
         </where>
         GROUP BY spu.id, spu.product_code, spu.product_name, cat.name, 
                  base.spec, base.unit, base.package_num, base.purchase_price, base.retail_price, stock.current_stock
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml
index 3928d33e2..4a49c9693 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SalesReportMapper.xml
@@ -32,6 +32,8 @@
             spu.id AS product_id,
             spu.product_code,
             spu.product_name,
+            spu.dept_id,
+            spu.create_by,
             cat.name AS category_name,
             base.spec AS spec,
             base.unit AS unit,