From 16dcef45b7d7aa433e046f7f2ae3c1e39ecf5c35 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 20 Feb 2025 21:42:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(saleOrder):=20=E9=94=80=E5=94=AE=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E7=BB=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 SaleOrderReportRequest 中添加 organizationId 字段
- 在 SaleOrderService 中设置当前用户的组织机构 ID- 在 SQL 查询中添加组织机构 ID 的过滤条件
---
 .../cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java | 1 +
 .../cn/lihongjie/coal/saleOrder/service/SaleOrderService.java   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java b/src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java
index 949857e2..f6b29f4b 100644
--- a/src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java
+++ b/src/main/java/cn/lihongjie/coal/saleOrder/dto/SaleOrderReportRequest.java
@@ -55,6 +55,7 @@ month
     private List<String> productIds;
 
 
+    private String organizationId;
 
 
 
diff --git a/src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java b/src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java
index 1a2732c4..38c37f9b 100644
--- a/src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java
+++ b/src/main/java/cn/lihongjie/coal/saleOrder/service/SaleOrderService.java
@@ -300,6 +300,7 @@ public class SaleOrderService extends BaseService<SaleOrderEntity, SaleOrderRepo
         if (CollectionUtils.isEmpty(request.getFieldInfos())) {
             request.setFieldInfos(new ArrayList<>());
         }
+        request.setOrganizationId(Ctx.currentUser().getOrganizationId());
 
         String sql =
                 FreeMakerUtils.render(
@@ -340,6 +341,7 @@ public class SaleOrderService extends BaseService<SaleOrderEntity, SaleOrderRepo
 
 
                                 where 1=1
+                                and o.organization_id = :organizationId
 
                                 <#if startTime??>            and o.start_time >= :startTime            </#if>