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: {