From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:23 +0800
Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时，RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。
---
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