From 83ef8b0e6fc20d4528bf54468f7fe4c1fdef86b1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
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 a07541e..cbf6296 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-->
+ LEFT 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-->
+ LEFT JOIN ba_user_role usro ON usro.userId = user.id
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
--
Gitblit v1.8.0