From 93776973d8475fbdfd5febb4f08ca2a64b82adac Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 24 Oct 2022 17:31:36 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E5=B9=B3=E5=8F=B0=E5=AF=B9=E6=8E=A5):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A3=9E=E4=B9=A6=E5=9B=BD=E9=99=85=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/plugins/server/XLarksuiteServer.java | 2 +- frontend/src/views/login/index.vue | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java b/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java index 52223daff3..64d9506cfb 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java @@ -101,7 +101,7 @@ public class XLarksuiteServer { String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : (username + "@larksuite.work"); sysUserService.validateExistUser(username, larkUserInfo.getName(), email); sysUserService.saveLarksuiteCUser(larkUserInfo, email); - sysUserEntity = authUserService.getUserByLarkId(username); + sysUserEntity = authUserService.getUserByLarksuiteId(username); } TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build(); String realPwd = sysUserEntity.getPassword(); diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index 56e1e88565..e5881db818 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -379,6 +379,11 @@ export default { this.switchCodeIndex(6) } this.clearLarkMsg() + + if (Cookies.get('LarksuiteError')) { + this.$error(Cookies.get('LarksuiteError')) + } + this.clearLarksuiteMsg() }, methods: {