From 4df9fcadde2ee6bc3a572a8355bec9bbeaa40f10 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 9 Jul 2024 16:48:34 +0800
Subject: [PATCH] md

---
 .../mapper/EmisSettleSubBillMapper.xml          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 362e6ebed..4a482cf13 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -102,6 +102,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.dispatch_underling_site_code =  #{params.dispatchUnderlingSiteCode}
             </if>
 
+            <if test="params.mergeStatus != null and params.mergeStatus == 1">
+                and b.settle_bill_no is null
+            </if>
+
+            <if test="params.mergeStatus != null and params.mergeStatus == 2">
+                and b.settle_bill_no is not null
+            </if>
+
             <if test="params.payee != null and params.payee != ''">
                 and a.payee =  #{params.payee}
             </if>
@@ -205,6 +213,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.dispatch_underling_site_code =  #{params.dispatchUnderlingSiteCode}
             </if>
 
+
+            <if test="params.mergeStatus != null and params.mergeStatus == 1">
+                and b.settle_bill_no is null
+            </if>
+
+            <if test="params.mergeStatus != null and params.mergeStatus == 2">
+                and b.settle_bill_no is not null
+            </if>
+
             <if test="params.payee != null and params.payee != ''">
                 and a.payee =  #{params.payee}
             </if>