From ffcb1ef79249494b0f4c22dbf344ad1416060bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 6 Mar 2026 15:20:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=BA=94=E6=94=B6=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E5=BA=93=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/reconciliation/ReconciliationMapper.xml       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml
index 1660f94c4..99c13e6a5 100644
--- a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml
+++ b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml
@@ -289,7 +289,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{departmentName},
             #{userId},
             #{shipperName},
-            #{waybillSource},
+            <if test="waybillSource == null">DEFAULT</if>
+            <if test="waybillSource != null">#{waybillSource}</if>,
             #{waybillSourceName},
             #{reconciliationStart},
             #{reconciliationEnd},
@@ -300,8 +301,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{receivable},
             #{actualReceivable},
             #{uncollectedReceivable},
-            #{collectionState},
-            #{auditState},
+            <if test="collectionState == null">DEFAULT</if>
+            <if test="collectionState != null">#{collectionState}</if>,
+            <if test="auditState == null">DEFAULT</if>
+            <if test="auditState != null">#{auditState}</if>,
             #{createTime},
             #{createBy},
             #{createByName},