From 3aa736a946f6c28f3006d5c44d72d8b20377e5ba Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 9 Jul 2024 17:15:03 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisSettleSubBillMapper.xml    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 123c7a6a3..18a413014 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -213,13 +213,16 @@ 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
+                and b.bl_confirm='1'
+                and b.bl_site_confirm='1'
             </if>
 
             <if test="params.mergeStatus != null and params.mergeStatus == 2">
                 and b.settle_bill_no is not null
+                and b.bl_confirm='1'
+                and b.bl_site_confirm='1'
             </if>
 
             <if test="params.payee != null and params.payee != ''">