From 0c4507ad5ebdbf8ac1c2bbcdcf38203908e61378 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/WorkorderExtMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderExtMapper.xml b/server/src/main/resources/mappers/WorkorderExtMapper.xml
index 220473e..8ddc14a 100644
--- a/server/src/main/resources/mappers/WorkorderExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderExtMapper.xml
@@ -957,10 +957,10 @@
</if>
</otherwise>
</choose>
- <if test="startDate != null">
+ <if test="startDate != null and startDate!=''">
AND `a`.`PLAN_DATE` >= #{startDate}
</if>
- <if test="endDate != null">
+ <if test="endDate != null and endDate!=''">
AND #{endDate} >= `a`.`PLAN_DATE`
</if>
<if test="mixParam != null and mixParam!=''">
--
Gitblit v1.9.3