From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中,关阀报(83)中的RTU时钟改为关阀时间,但代码误注解掉了这行代码,修改之; 2、通信中间件测试web系统增加查询所在在线情况的命令下发。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeFeedbackMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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">

--
Gitblit v1.8.0