From 5bc0e33a300e1c5c293ae620d4deb4b85d475581 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Sun, 26 Sep 2021 19:39:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml   | 6 +++---
 .../project/mapper/xml/PayWorkingGroupSubItemMapper.xml     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 021f8771..f1ef6302 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -130,15 +130,15 @@
             </if>
             <choose>
                 <when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
-                    AND pwgs.allMoney >= #{payWorkingGroupSearch.allMoney} and pwgs.allMoney <![CDATA[<]]>=
+                    AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} and if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) <![CDATA[<]]>=
                     #{payWorkingGroupSearch.allMoneyTwo}
                 </when>
                 <otherwise>
                     <if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''">
-                        AND pwgs.allMoney >= #{payWorkingGroupSearch.allMoney}
+                        AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney}
                     </if>
                     <if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
-                        AND pwgs.allMoney <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo}
+                        AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo}
                     </if>
                 </otherwise>
             </choose>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
index 897b43ad..bc1fae0e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
@@ -103,14 +103,14 @@
             </if>
             <choose>
                 <when test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != '' and payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
-                    AND  pwgs.receivable_amount >= #{payWorkingGroupSubletSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
+                    AND  if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney} and if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
                 </when>
                 <otherwise>
                     <if test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != ''">
-                        AND pwgs.receivable_amount >= #{payWorkingGroupSubletSearch.allMoney}
+                        AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney}
                     </if>
                     <if test="payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
-                        AND  pwgs.receivable_amount <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
+                        AND  if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
                     </if>
                 </otherwise>
             </choose>