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/RmClientAmountDayMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
index 7275f77..0c43003 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -184,10 +184,10 @@
from rm_client_amount_day rcad
Left join se_client sc on sc.id = rcad.client_id
<where>
- <if test="clientName != null">
+ <if test="clientName != null and clientName != '' ">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
- <if test="clientId != null">
+ <if test="clientId != null and clientId != ''">
and rcad.client_id = #{clientId}
</if>
<if test="startDt != null">
@@ -215,10 +215,10 @@
from rm_client_amount_day rcad
Left join se_client sc on sc.id = rcad.client_id
<where>
- <if test="clientName != null">
+ <if test="clientName != null and clientName != '' ">
and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
</if>
- <if test="clientId != null">
+ <if test="clientId != null and clientId != ''">
and rcad.client_id = #{clientId}
</if>
<if test="startDt != null">
--
Gitblit v1.8.0