From 2e1ec00ad4357846551db3425543f443b269e293 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 23 Sep 2021 18:57:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8Dldap?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/auth/server/AuthServer.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 35bd3ac867..b94eca461e 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -70,12 +70,16 @@ public class AuthServer implements AuthApi { DataEaseException.throwException(validateResult.getMsg()); } XpackLdapUserEntity ldapUserEntity = validateResult.getData(); - LdapAddRequest ldapAddRequest = new LdapAddRequest(); - ldapAddRequest.setUsers(new ArrayList(){{add(ldapUserEntity);}}); - ldapAddRequest.setEnabled(1L); - ldapAddRequest.setDeptId(1L); - ldapAddRequest.setRoleIds(new ArrayList(){{add(2L);}}); - sysUserService.saveLdapUsers(ldapAddRequest); + SysUserEntity user = authUserService.getUserByName(username); + if(ObjectUtils.isEmpty(user) || ObjectUtils.isEmpty(user.getUserId())) { + LdapAddRequest ldapAddRequest = new LdapAddRequest(); + ldapAddRequest.setUsers(new ArrayList(){{add(ldapUserEntity);}}); + ldapAddRequest.setEnabled(1L); + ldapAddRequest.setDeptId(1L); + ldapAddRequest.setRoleIds(new ArrayList(){{add(2L);}}); + sysUserService.saveLdapUsers(ldapAddRequest); + } + username = validateResult.getData().getUserName(); } // 增加ldap登录方式