From 3b668f811fce818ce69ac9bca4195976704dc719 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 十二月 2023 15:35:59 +0800
Subject: [PATCH] 1、优化ID生成器，方法同步锁改为静态变量同步锁； 2、RTU模拟器中增加TCP连接输出日志信息； 3、RTU模拟器中增加Rmi相关输出日志信息；
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index 4aa5498..c80eb58 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -66,10 +66,10 @@
from ba_user
where supperAdmin!=1 and deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone !=''">
phone = #{phone,jdbcType=VARCHAR}
</if>
</trim>
@@ -84,10 +84,10 @@
left join ba_block bb on bu.blockId = bb.id
where bu.supperAdmin!=1 and bu.deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
bu.name like concat('%', #{name}, '%') and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone !=''">
bu.phone = #{phone,jdbcType=VARCHAR}
</if>
</trim>
--
Gitblit v1.8.0