From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 八月 2024 10:11:04 +0800
Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java, 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
index 195831a..de4c4e3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
@@ -37,7 +37,7 @@
     count(*)
     from ba_client_type
     <trim prefix="where" suffixOverrides="and">
-      <if test="name != null">
+      <if test="name != null and name != ''">
         name like concat('%', #{name}, '%') and
       </if>
     </trim>
@@ -48,7 +48,7 @@
     <include refid="Base_Column_List" />
     from ba_client_type
     <trim prefix="where" suffixOverrides="and">
-      <if test="name != null">
+      <if test="name != null and name != ''">
         name like concat('%', #{name}, '%')
       </if>
     </trim>

--
Gitblit v1.8.0