From 1f46976c9ee72d7889fceee968db9c8aef885eca Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 28 十月 2024 17:28:15 +0800 Subject: [PATCH] 远程监控中开关阀记录查询重构,增加了水价信息,调整了显示内容,优化SQL语句,开闭阀类型改为通信协议中的Common*.*.java中的统一匹配。 --- 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