Merge branch 'v1.4' of github.com:dataease/dataease into v1.4

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登录方式
 

backend/src/main/java/io/dataease/service/sys/SysUserService.java

@@ -143,7 +143,8 @@ 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.setNickName(user.getNickname());
             sysUser.setDeptId(request.getDeptId());
             sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD));
             sysUser.setCreateTime(now);