diff --git a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java index cc5603e1b0..baa5927cf9 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java @@ -88,7 +88,7 @@ public class XDingtalkServer { DEException.throwException("未开启钉钉"); } DingUserEntity dingUserEntity = dingtalkXpackService.userInfo(code); - String username = dingUserEntity.getUserId(); + String username = dingUserEntity.getUserid(); String unionid = dingUserEntity.getUnionid(); SysUserEntity sysUserEntity = authUserService.getUserBySub(unionid, 5); if (null == sysUserEntity) { 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 a361c5b4b2..3d55955005 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -147,13 +147,7 @@ public class SysUserService { sysUser.setIsAdmin(false); sysUser.setSub(userId); sysUserMapper.insert(sysUser); - SysUser dbUser = findOne(sysUser); - if (null != dbUser && null != dbUser.getUserId()) { - // 默认角色是普通员工 - List roleIds = new ArrayList(); - roleIds.add(2L); - saveUserRoles( dbUser.getUserId(), roleIds); - } + } @Transactional @@ -161,7 +155,7 @@ public class SysUserService { long now = System.currentTimeMillis(); SysUser sysUser = new SysUser(); - sysUser.setUsername(dingUserEntity.getUserId()); + sysUser.setUsername(dingUserEntity.getUserid()); sysUser.setNickName(dingUserEntity.getName()); sysUser.setEmail(email); sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD)); @@ -175,12 +169,7 @@ public class SysUserService { sysUser.setSub(dingUserEntity.getUnionid()); sysUser.setPhone(dingUserEntity.getMobile()); sysUserMapper.insert(sysUser); - SysUser dbUser = findOne(sysUser); - /*if (null != dbUser && null != dbUser.getUserId()) { - List roleIds = new ArrayList(); - roleIds.add(2L); - saveUserRoles( dbUser.getUserId(), roleIds); - }*/ + } @Transactional