From 935fbd794bbdadc3d28c868db45c8039a6d64097 Mon Sep 17 00:00:00 2001 From: lzq Date: Fri, 15 Aug 2025 10:32:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervisory/user/pojo/AddUserParam.java | 3 +++ .../supervisory/user/pojo/UserModifyParam.java | 2 ++ .../user/service/SysUserService.java | 17 ++++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java index f7ff49e..d0e24ee 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java @@ -3,6 +3,7 @@ package com.njzscloud.supervisory.user.pojo; import cn.hutool.core.util.StrUtil; import com.njzscloud.common.mvc.validator.Constrained; import com.njzscloud.common.mvc.validator.ValidRule; +import com.njzscloud.supervisory.role.pojo.SysRoleEntity; import com.njzscloud.supervisory.user.contant.Gender; import lombok.Getter; import lombok.Setter; @@ -38,6 +39,8 @@ public class AddUserParam implements Constrained { */ private List roleIds; + private List roles; + @Override public ValidRule[] rules() { return new ValidRule[]{ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java index 53451c6..2f5fee8 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.njzscloud.common.mvc.validator.Constrained; import com.njzscloud.common.mvc.validator.Constraint; import com.njzscloud.common.mvc.validator.ValidRule; +import com.njzscloud.supervisory.role.pojo.SysRoleEntity; import com.njzscloud.supervisory.user.contant.Gender; import lombok.Getter; import lombok.Setter; @@ -37,6 +38,7 @@ public class UserModifyParam implements Constrained { * 角色 Id 列表 */ private List roleIds; + private List roles; @Override public ValidRule[] rules() { diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java index 9e31631..5175dce 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java @@ -76,8 +76,11 @@ public class SysUserService extends ServiceImpl im sysUserAccountService.add(addUserAccountParam.setUserId(userEntityId)); - List roleIds = addUserParam.getRoleIds(); - if (CollUtil.isEmpty(roleIds)) return userEntityId; + // List roleIds = addUserParam.getRoleIds(); + List roles = addUserParam.getRoles(); + if (CollUtil.isEmpty(roles)) return userEntityId; + + List roleIds = roles.stream().map(SysRoleEntity::getId).collect(Collectors.toList()); List sysRoleEntities = sysRoleService.listByIds(roleIds); Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在")); @@ -105,7 +108,7 @@ public class SysUserService extends ServiceImpl im String wechatUnionid = account.getWechatUnionid(); List oldSysUserList = sysUserAccountService.list(Wrappers.lambdaQuery() - .ne(SysUserAccountEntity::getId, id) + .ne(SysUserAccountEntity::getUserId, id) .and(it1 -> it1 .eq(SysUserAccountEntity::getUsername, username) .or().eq(StrUtil.isNotBlank(email), SysUserAccountEntity::getEmail, email) @@ -127,8 +130,12 @@ public class SysUserService extends ServiceImpl im sysUserAccountService.modify(account.setUserId(id)); - List roleIds = userModifyParam.getRoleIds(); - if (CollUtil.isEmpty(roleIds)) return; + // List roleIds = userModifyParam.getRoleIds(); + List roles = userModifyParam.getRoles(); + + if (CollUtil.isEmpty(roles)) return; + + List roleIds = roles.stream().map(SysRoleEntity::getId).collect(Collectors.toList()); List sysRoleEntities = sysRoleService.listByIds(roleIds); Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在"));