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/BaRoleMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index 14923bd..20afb5d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -47,7 +47,7 @@
     count(*)
     from ba_role where deleted!=1
     <trim prefix="and" suffixOverrides="and">
-      <if test="name != null">
+      <if test="name != null and name != ''">
         name like concat('%', #{name}, '%')
       </if>
     </trim>
@@ -58,7 +58,7 @@
     <include refid="part_Column_List" />
     from ba_role where deleted!=1
     <trim prefix="and" suffixOverrides="and">
-      <if test="name != null">
+      <if test="name != null and name != ''">
         name like concat('%', #{name}, '%')
       </if>
     </trim>
@@ -70,7 +70,7 @@
     </trim>
   </select>
 
-  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+  <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
     insert into ba_role (<include refid="Base_Column_List" />)
     values (#{id,jdbcType=BIGINT},
             #{name,jdbcType=VARCHAR},

--
Gitblit v1.8.0