From a74f09cc108e5955bcef1d257ff28e039f9597a2 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 1 Nov 2021 12:05:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20ldap=E5=BF=BD=E7=95=A5=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/auth/server/AuthServer.java | 4 ++--
 .../src/main/java/io/dataease/service/sys/SysUserService.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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<Long>(){{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<XpackLdapUserEntity> users = request.getUsers();
         List<SysUser> 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);