From f2732b0a8c5bc4e1ddbcafa5eeffd1e6ed2e52b7 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 10 三月 2026 13:19:59 +0800
Subject: [PATCH] yys  优化员工工资计算逻辑

---
 src/main/resources/mapper/sales/ShipmentApprovalMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/sales/ShipmentApprovalMapper.xml b/src/main/resources/mapper/sales/ShipmentApprovalMapper.xml
index 8b9792e..68cd664 100644
--- a/src/main/resources/mapper/sales/ShipmentApprovalMapper.xml
+++ b/src/main/resources/mapper/sales/ShipmentApprovalMapper.xml
@@ -9,7 +9,7 @@
         FROM shipment_approval sa
                  LEFT JOIN shipping_info si ON sa.shipping_info_id = si.id
                  LEFT JOIN sales_ledger sl ON sa.sales_ledger_id = sl.id
-                 LEFT JOIN sales_ledger_product slp ON sa.sales_ledger_product_id = slp.id
+                 LEFT JOIN sales_ledger_product slp ON sa.sales_ledger_product_id = slp.id and slp.type = 1
                  LEFT JOIN sys_user T2 ON sl.entry_person = T2.user_id
         <where>
             1=1

--
Gitblit v1.9.3