From e8559e1afa5c328dfb88edd56f9266fabf86a732 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 16 Oct 2024 09:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E4=BF=9D=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=AF=BC=E5=85=A5=E6=8A=A5=E6=97=A0=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=20=EF=BC=88=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9bug=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml   | 2 +-
 src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml  | 2 +-
 src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
index bb3e6b558..644a21d18 100644
--- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
@@ -265,7 +265,7 @@
         AND payment_organization = #{paymentOrganization}
         AND fund_scheme_id is not null
         AND fund_start_time is not null AND fund_start_time <![CDATA[ <= ]]> #{billMonth}
-        AND (fund_end_time is null OR fund_end_time <![CDATA[ >= ]]> #{billMonth})
+        AND (fund_end_time is null OR fund_end_time <![CDATA[ >= ]]> #{billMonth}  OR fund_end_time  ='')
     </select>
 
     <select id="listAll" resultMap="BaseResultMap">
diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
index 26db75504..ffdeb8194 100644
--- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
@@ -248,7 +248,7 @@
         AND payment_organization = #{paymentOrganization}
         AND other_scheme_id is not null
         AND other_start_time is not null AND other_start_time <![CDATA[ <= ]]> #{billMonth}
-        AND (other_end_time is null OR other_end_time <![CDATA[ >= ]]> #{billMonth})
+        AND (other_end_time is null OR other_end_time <![CDATA[ >= ]]> #{billMonth} OR other_end_time ='')
     </select>
 
     <select id="listAll" resultMap="BaseResultMap">
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
index 9041bde36..e8565471a 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
@@ -909,7 +909,7 @@
         AND payment_organization = #{paymentOrganization}
         AND social_scheme_id is not null
         AND social_start_time is not null AND social_start_time <![CDATA[ <= ]]> #{billMonth}
-        AND (social_end_time is null OR social_end_time <![CDATA[ >= ]]> #{billMonth})
+        AND (social_end_time is null OR social_end_time <![CDATA[ >= ]]> #{billMonth} OR social_end_time ='')
     </select>
 
     <select id="listAll" resultMap="BaseResultMap">