From fc9fe221d7bbd1b1d4a1aac0e0b955c675d56bb1 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 29 Dec 2025 06:31:21 +0800 Subject: [PATCH] =?UTF-8?q?1487=20fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=94=A8=E6=88=B7=E7=9A=84=20username=20=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E4=BC=9A=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/service/user/AdminUserServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index b3dab061b9..84e3bb6497 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -36,7 +36,6 @@ import com.mzt.logapi.service.impl.DiffParseFunction; import com.mzt.logapi.starter.annotation.LogRecord; import jakarta.annotation.Resource; import jakarta.validation.ConstraintViolationException; -import java.util.concurrent.atomic.AtomicInteger; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Lazy; import org.springframework.security.crypto.password.PasswordEncoder; @@ -45,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; @@ -285,14 +285,12 @@ public class AdminUserServiceImpl implements AdminUserService { @Override public PageResult getUserPage(UserPageReqVO reqVO) { // 如果有角色编号，查询角色对应的用户编号 - Set userIds; + Set userIds = null; if (reqVO.getRoleId() != null) { userIds = permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())); if (CollUtil.isEmpty(userIds)) { return PageResult.empty(); } - } else { - userIds = null; } // 分页查询 @@ -497,8 +495,7 @@ public class AdminUserServiceImpl implements AdminUserService { try { ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class).setPassword(initPassword)); } catch (ConstraintViolationException ex) { - String key = importUser.getUsername(); - if (StrUtil.isBlank(key)) key = "第" + currentIndex + "行"; + String key = StrUtil.blankToDefault(importUser.getUsername(), "第 " + currentIndex + " 行"); respVO.getFailureUsernames().put(key, ex.getMessage()); return; }