From 64144d74daa4e6abe432f1bbebb6a2281886f32d Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Mon, 20 Nov 2023 09:41:09 +0800
Subject: [PATCH] =?UTF-8?q?lis=E6=9F=A5=E8=AF=A2=E6=82=A3=E8=80=85?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=87=BA=E9=99=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/TBasicMapper.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index 846a9a0..55cfa5d 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -63,7 +63,7 @@
             <if test="dto.admisstimes != null">
                 and `admiss_times` = #{dto.admissTimes}
             </if>
-            <if test="dto.admisstimes != null">
+            <if test="dto.disDateStart != null and dto.disDateStart != ''">
                 and `dis_date` between #{dto.disDateStart} AND #{dto.disDateEnd}
             </if>
 
@@ -89,10 +89,7 @@
             <if test="dto.admisstimes != null">
                 and `admiss_times` = #{dto.admissTimes}
             </if>
-            <if test="dto.admisstimes != null">
-                and `dis_date` between #{dto.disDateStart} AND #{dto.disDateEnd}
-            </if>
-            <if test="dto.admisstimes != null">
+           <if test="dto.disDateStart != null and dto.disDateStart != ''">
                 and `dis_date` between #{dto.disDateStart} AND #{dto.disDateEnd}
             </if>
         LIMIT ${offset},${size}