From 7f5d914898c9d05942705ce7d80c0d14a8174df8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十二月 2023 15:57:14 +0800
Subject: [PATCH] 1、common模块优化代码; 2、通信中间件优化代码,队列遍历由递归调用改为while循环,原因是队列数据量大时递归调易产生栈溢出,HashTable多线程应用时仍有线程安全问题,改为HashMap+同步锁; 3、RTU模拟器和模拟器控制服务增加report命令

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
index 6be18b6..bca158d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -66,13 +66,13 @@
             <if test="blockId != null">
                 bc.blockId = #{blockId,jdbcType=BIGINT} and
             </if>
-            <if test="name != null">
+            <if test="name != null and name != ''">
                 bc.`name` like concat('%', #{name}, '%') and
             </if>
-            <if test="num != null">
+            <if test="num != null and num != ''">
                 bc.num = #{num,jdbcType=VARCHAR} and
             </if>
-            <if test="phone != null">
+            <if test="phone != null and phone != ''">
                 bc.phone = #{phone,jdbcType=VARCHAR} and
             </if>
         </trim>

--
Gitblit v1.8.0