diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index 73fea40a4f..3e0e3d1d6a 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -73,11 +73,11 @@ public class AuthServer implements AuthApi { ldapAddRequest.setEnabled(1L); // ldapAddRequest.setDeptId(1L); ldapAddRequest.setRoleIds(new ArrayList(){{add(2L);}}); - sysUserService.validateExistUser(ldapUserEntity.getUserName(), ldapUserEntity.getEmail()); + sysUserService.validateExistUser(ldapUserEntity.getUsername(), ldapUserEntity.getEmail()); sysUserService.saveLdapUsers(ldapAddRequest); } - username = validateResult.getData().getUserName(); + username = validateResult.getData().getUsername(); } // 增加ldap登录方式 diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java index dfd8c7e020..4127947f19 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -143,7 +143,7 @@ public class SysUserService { List users = request.getUsers(); List sysUsers = users.stream().map(user -> { SysUser sysUser = BeanUtils.copyBean(new SysUser(), user); - sysUser.setUsername(user.getUserName()); + sysUser.setUsername(user.getUsername()); sysUser.setDeptId(request.getDeptId()); sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD)); sysUser.setCreateTime(now);