From 3c221b43ce4ef67ad3c4639ade6f1167862c9a03 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 11 六月 2024 10:19:26 +0800
Subject: [PATCH] 1、重构靳总协议实现中上行数据的包路径为upVos; 2、增加log4j2中的日志编码; 3、pipIrrMwTestWeb中增加测试项。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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 3b273b9..e2e5d47 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -269,7 +269,7 @@
         SELECT
             COUNT(*) AS recordCount
         FROM ba_user user
-            INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!--            INNER JOIN ba_user_role usro ON usro.userId = user.id-->
         <where>
             AND user.supperAdmin != 1
             AND user.deleted = 0
@@ -302,7 +302,7 @@
             CAST(blockId AS char) AS blockId,
             (SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
         FROM ba_user user
-            INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!--            INNER JOIN ba_user_role usro ON usro.userId = user.id-->
         <where>
             AND user.supperAdmin != 1
             AND user.deleted = 0

--
Gitblit v1.8.0