From 05b4b18f4a5e14804297336d94f683bbf8486e40 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 22 八月 2024 09:01:16 +0800
Subject: [PATCH] 优化用户分页查询接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java |    8 ++++----
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml                      |    4 ++--
 2 files changed, 6 insertions(+), 6 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
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index d443956..dba3c5e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -94,11 +94,11 @@
     public BaseResponse<QueryResultVo<List<VoUserInfo>>> some(QueryVo vo) {
         try {
             QueryResultVo<List<VoUserInfo>> res = this.sv.selectSome(vo);
-            if(res.itemTotal == 0) {
-                return BaseResponseUtils.buildSuccess(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
-            }else {
+//            if(res.itemTotal == 0) {
+//                return BaseResponseUtils.buildSuccess(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
+//            }else {
                 return BaseResponseUtils.buildSuccess(res);
-            }
+//            }
 
 
         } catch (Exception e) {

--
Gitblit v1.8.0