From c2ad2126d6f8423e0a5e6e20bbb91ef6bb1cffc0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:26:27 +0800
Subject: [PATCH] fix(approve): 修复审批流程为空时的异常处理
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 85f62c0..7ccd14a 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -10,7 +10,7 @@
WHERE sales_contract_no LIKE CONCAT('%',#{datePart},'%')
</select>
<select id="getSalesNo" resultType="com.ruoyi.sales.pojo.SalesLedger">
-
+
</select>
<select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger">
@@ -111,14 +111,16 @@
FROM sales_ledger
GROUP BY customer_name
</select>
- <select id="listSalesLedger" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
- select * from
+ <select id="listSalesLedgerAndShipped" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
+ select distinct sl.id as 'disId', sl.* from
sales_ledger sl
- <where>
+ left join sales_ledger_product slp on sl.id = slp.sales_ledger_id
+ left join shipping_info si on slp.id = si.sales_ledger_product_id
+ where si.status = '宸插彂璐�'
<if test="ew.customerName != null and ew.customerName != '' ">
and sl.customer_name like concat('%',#{ew.customerName},'%')
</if>
- </where>
+ order by sl.execution_date desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3