From 38d1acf27a89d07f6880ffd99542d38a82a4c242 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 11 Jun 2026 14:18:15 +0800
Subject: [PATCH] 11

---
 .../bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
index 4d55ea7cc..55505f7cf 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
@@ -274,7 +274,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public IPage<UserVO> getUsersWithRolePage(Page page, UserDTO userDTO, DataScope dataScope) {
-        dataScope.setScopeUserName(null);
+        if (ObjectUtil.isNotEmpty(dataScope)) {
+            dataScope.setScopeUserName(null);
+        }
         IPage<UserVO> list = baseMapper.getUserVosPage(page, userDTO, dataScope);
         if (ObjectUtil.isNotEmpty(list.getRecords())) {
             List<Long> userIds = list.getRecords().stream().map(UserVO::getUserId).distinct().toList();