From f3dcc26f04941314f9037b49c0b78621764fb9ec Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 28 Sep 2022 16:45:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E9=92=89=E9=92=89?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=BB=91=E5=AE=9ADE=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8E=E4=BD=BF=E7=94=A8=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/plugins/server/XDingtalkServer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 fcc5d24756..27414e6836 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDingtalkServer.java @@ -95,13 +95,12 @@ public class XDingtalkServer { } DingUserEntity dingUserEntity = dingtalkXpackService.userInfo(code); String username = dingUserEntity.getUserid(); - String unionid = dingUserEntity.getUnionid(); - SysUserEntity sysUserEntity = authUserService.getUserByDingtalkId(unionid); + SysUserEntity sysUserEntity = authUserService.getUserByDingtalkId(username); if (null == sysUserEntity) { String email = StringUtils.isNotBlank(dingUserEntity.getOrg_email()) ? dingUserEntity.getOrg_email() : StringUtils.isNotBlank(dingUserEntity.getEmail()) ? dingUserEntity.getEmail() : (username + "@dingtalk.work"); sysUserService.validateExistUser(username, dingUserEntity.getName(), email); sysUserService.saveDingtalkCUser(dingUserEntity, email); - sysUserEntity = authUserService.getUserByDingtalkId(unionid); + sysUserEntity = authUserService.getUserByDingtalkId(username); } TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build(); String realPwd = sysUserEntity.getPassword();