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<Long> roleIds;
 
+    private List<SysRoleEntity> 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<Long> roleIds;
+    private List<SysRoleEntity> 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<SysUserMapper, SysUserEntity> im
 
         sysUserAccountService.add(addUserAccountParam.setUserId(userEntityId));
 
-        List<Long> roleIds = addUserParam.getRoleIds();
-        if (CollUtil.isEmpty(roleIds)) return userEntityId;
+        // List<Long> roleIds = addUserParam.getRoleIds();
+        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);
         Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在"));
@@ -105,7 +108,7 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUserEntity> im
         String wechatUnionid = account.getWechatUnionid();
 
         List<SysUserAccountEntity> oldSysUserList = sysUserAccountService.list(Wrappers.<SysUserAccountEntity>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<SysUserMapper, SysUserEntity> im
 
         sysUserAccountService.modify(account.setUserId(id));
 
-        List<Long> roleIds = userModifyParam.getRoleIds();
-        if (CollUtil.isEmpty(roleIds)) return;
+        // List<Long> roleIds = userModifyParam.getRoleIds();
+        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);
         Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在"));