dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
taojinlong 2021-11-01 14:08:07 +08:00
commit 3a671b21d4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/auth/server/AuthServer.java
View File

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

3
backend/src/main/java/io/dataease/service/sys/SysUserService.java
View File

@ -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);