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 53dffa07f1..96979bfda7 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,12 @@ public class AuthServer implements AuthApi { DataEaseException.throwException(validateResult.getMsg()); } XpackLdapUserEntity ldapUserEntity = validateResult.getData(); - SysUserEntity user = authUserService.getUserByName(username); + SysUserEntity user = authUserService.getLdapUserByName(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.setDeptId(1L); ldapAddRequest.setRoleIds(new ArrayList(){{add(2L);}}); sysUserService.validateExistUser(ldapUserEntity.getUserName(), ldapUserEntity.getEmail()); sysUserService.saveLdapUsers(ldapAddRequest); diff --git a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java b/backend/src/main/java/io/dataease/auth/service/AuthUserService.java index 22462d5fe9..a01fe2a3cc 100644 --- a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java +++ b/backend/src/main/java/io/dataease/auth/service/AuthUserService.java @@ -13,6 +13,8 @@ public interface AuthUserService { SysUserEntity getUserByName(String username); + SysUserEntity getLdapUserByName(String username); + SysUserEntity getUserBySub(String sub); List roles(Long userId); diff --git a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java index fe11af4de1..ebd6febcec 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java @@ -52,6 +52,12 @@ public class AuthUserServiceImpl implements AuthUserService { return authMapper.findUserByName(username); } + + @Override + public SysUserEntity getLdapUserByName(String username) { + return authMapper.findLdapUserByName(username); + } + @Override public SysUserEntity getUserBySub(String sub) { return authMapper.findUserBySub(sub); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java index 2b1355256f..54796cd366 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java @@ -25,6 +25,8 @@ public interface AuthMapper { SysUserEntity findUserByName(@Param("username") String username); + SysUserEntity findLdapUserByName(@Param("username") String username); + SysUserEntity findUserBySub(@Param("sub") String sub); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml index 3492d7ec10..fed0bc2a98 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml @@ -28,6 +28,10 @@ select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin from sys_user where username = #{username} + +