From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
index 2435b5d..2dcdb60 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
@@ -12,10 +12,10 @@
<if test="animalHeatVo.type==2">
and date_format(create_time,'%Y%m') = date_format(now(),'%Y%m')
</if>
- <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!='' and animalHeatVo.endTime!=null and animalHeatVo.endTime!='' ">
+ <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!='' and animalHeatVo.endTime!=null and animalHeatVo.endTime!='' and animalHeatVo.begTime!='undefined' and animalHeatVo.endTime!='undefined' ">
and date(create_time) between #{animalHeatVo.begTime} and #{animalHeatVo.endTime}
</if>
- <if test="animalHeatVo.timeDesc!=null and animalHeatVo.timeDesc!=''">
+ <if test="animalHeatVo.timeDesc!=null and animalHeatVo.timeDesc!='' and animalHeatVo.timeDesc!='undefined'">
<if test="animalHeatVo.timeDesc=='0-2'">
and hour(create_time)>=0 and hour(create_time) <2
</if>
@@ -202,7 +202,7 @@
<select id="exportAnimalHeat" resultType="org.springblade.common.entity.AnimalHeatExcel">
SELECT * FROM blade_animal_heat
where 1=1
- <if test="animalHeatVo.status!=null">
+ <if test="animalHeatVo.status!=null and animalHeatVo.status!='' and animalHeatVo.status!='undefined'">
and status=#{animalHeatVo.status}
</if>
<include refid="animalHeatCondition"></include>
--
Gitblit v1.9.3