From 798c29da3dd62b11fcc5ad31b5c2a9dd74ea3948 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 01 八月 2024 16:39:37 +0800
Subject: [PATCH] 远程测控接口解决bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml
index f660158..60bfee9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml
@@ -212,10 +212,10 @@
from ope_feedback ofb
left join se_client sc on ofb.feedbacker_id = sc.id
<where>
- <if test="feedbackerId != null">
+ <if test="feedbackerId != null and feedbackerId != '' ">
and ofb.feedbacker_id = #{feedbackerId,jdbcType=BIGINT}
</if>
- <if test="feedbackerName != null">
+ <if test="feedbackerName != null and feedbackerName != '' ">
and sc.name = #{feedbackerName,jdbcType=VARCHAR}
</if>
<if test="timeStart != null">
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
index b049664..840a42a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/lossDay/LossDayQueryVo.java
@@ -6,7 +6,7 @@
import lombok.*;
import org.springframework.format.annotation.DateTimeFormat;
-import java.sql.Date;
+import java.util.Date;
/**
* @author :WuZeYu
--
Gitblit v1.8.0