From 9360b493f6ad8772239386758747960700ef8f5c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 14 Aug 2024 19:49:39 +0800
Subject: [PATCH] md

---
 emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml | 2 +-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index fbb9e958b..1933616f9 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
                 and a.bill_code in (
-                select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                    select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index f085b4f55..27def10fb 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -662,7 +662,7 @@
 
             <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
                 and a.bill_code in (
-                    select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                    select bill_code from emis_waybill_problem_info ewpi where ewpi.`problem_type` is not null and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
                 )
             </if>