lzq
/
zsy-recycling-supervision
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

登录问题修改

master
lzq 2025-08-15 10:32:29 +08:00
parent 8aedb41d0b
commit 935fbd794b
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java
View File

@ -3,6 +3,7 @@ package com.njzscloud.supervisory.user.pojo;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.njzscloud.common.mvc.validator.Constrained; import com.njzscloud.common.mvc.validator.Constrained;
import com.njzscloud.common.mvc.validator.ValidRule; import com.njzscloud.common.mvc.validator.ValidRule;
import com.njzscloud.supervisory.role.pojo.SysRoleEntity;
import com.njzscloud.supervisory.user.contant.Gender; import com.njzscloud.supervisory.user.contant.Gender;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -38,6 +39,8 @@ public class AddUserParam implements Constrained {
*/ */
private List<Long> roleIds; private List<Long> roleIds;
private List<SysRoleEntity> roles;
@Override @Override
public ValidRule[] rules() { public ValidRule[] rules() {
return new ValidRule[]{ return new ValidRule[]{

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.njzscloud.common.mvc.validator.Constrained; import com.njzscloud.common.mvc.validator.Constrained;
import com.njzscloud.common.mvc.validator.Constraint; import com.njzscloud.common.mvc.validator.Constraint;
import com.njzscloud.common.mvc.validator.ValidRule; import com.njzscloud.common.mvc.validator.ValidRule;
import com.njzscloud.supervisory.role.pojo.SysRoleEntity;
import com.njzscloud.supervisory.user.contant.Gender; import com.njzscloud.supervisory.user.contant.Gender;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -37,6 +38,7 @@ public class UserModifyParam implements Constrained {
* 角色 Id 列表 * 角色 Id 列表
*/ */
private List<Long> roleIds; private List<Long> roleIds;
private List<SysRoleEntity> roles;
@Override @Override
public ValidRule[] rules() { public ValidRule[] rules() {

17
njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java
View File

@ -76,8 +76,11 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUserEntity> im
sysUserAccountService.add(addUserAccountParam.setUserId(userEntityId)); sysUserAccountService.add(addUserAccountParam.setUserId(userEntityId));
List<Long> roleIds = addUserParam.getRoleIds(); // List<Long> roleIds = addUserParam.getRoleIds();
if (CollUtil.isEmpty(roleIds)) return userEntityId; List<SysRoleEntity> roles = addUserParam.getRoles();
if (CollUtil.isEmpty(roles)) return userEntityId;
List<Long> roleIds = roles.stream().map(SysRoleEntity::getId).collect(Collectors.toList());
List<SysRoleEntity> sysRoleEntities = sysRoleService.listByIds(roleIds); List<SysRoleEntity> sysRoleEntities = sysRoleService.listByIds(roleIds);
Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在")); Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在"));
@ -105,7 +108,7 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUserEntity> im
String wechatUnionid = account.getWechatUnionid(); String wechatUnionid = account.getWechatUnionid();
List<SysUserAccountEntity> oldSysUserList = sysUserAccountService.list(Wrappers.<SysUserAccountEntity>lambdaQuery() List<SysUserAccountEntity> oldSysUserList = sysUserAccountService.list(Wrappers.<SysUserAccountEntity>lambdaQuery()
.ne(SysUserAccountEntity::getId, id) .ne(SysUserAccountEntity::getUserId, id)
.and(it1 -> it1 .and(it1 -> it1
.eq(SysUserAccountEntity::getUsername, username) .eq(SysUserAccountEntity::getUsername, username)
.or().eq(StrUtil.isNotBlank(email), SysUserAccountEntity::getEmail, email) .or().eq(StrUtil.isNotBlank(email), SysUserAccountEntity::getEmail, email)
@ -127,8 +130,12 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUserEntity> im
sysUserAccountService.modify(account.setUserId(id)); sysUserAccountService.modify(account.setUserId(id));
List<Long> roleIds = userModifyParam.getRoleIds(); // List<Long> roleIds = userModifyParam.getRoleIds();
if (CollUtil.isEmpty(roleIds)) return; List<SysRoleEntity> roles = userModifyParam.getRoles();
if (CollUtil.isEmpty(roles)) return;
List<Long> roleIds = roles.stream().map(SysRoleEntity::getId).collect(Collectors.toList());
List<SysRoleEntity> sysRoleEntities = sysRoleService.listByIds(roleIds); List<SysRoleEntity> sysRoleEntities = sysRoleService.listByIds(roleIds);
Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在")); Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在"));