|
|
@@ -581,13 +581,11 @@ export default {
|
|
|
// 这一步是为了判断登录时，账户是否在组织下有账户问题（但现在获取账户时那部分已经被隐藏，多账号返回数字，这行代码没用了）
|
|
|
// if (this.OrgOptions.find((i) => i.Uorg == this.org)) {
|
|
|
// console.log('555',this.OrgOptions.find((i) => i.Uorg == this.org).id);
|
|
|
- if (this.org && this.OrgOptions.find((i) => i.Uorg == this.org) && mergedList.includes(this.OrgOptions.find((i) => i.Uorg == this.org).id)) {
|
|
|
+ if (regEmail.test(str) && this.OrgOptions.find((i) => mergedList.includes(i.id)) && this.OrgOptions.find((i) => mergedList.includes(i.id)).id) {
|
|
|
this.loading = false;
|
|
|
// 账号不可登录，请使用您的专属网址
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
|
|
- }
|
|
|
-
|
|
|
- if (!this.org && this.OrgOptions.find((i) => mergedList.includes(i.id)) && this.OrgOptions.find((i) => mergedList.includes(i.id)).id) {
|
|
|
+ }else if (this.org && this.OrgOptions.find((i) => i.Uorg == this.org) && mergedList.includes(this.OrgOptions.find((i) => i.Uorg == this.org).id)) {
|
|
|
this.loading = false;
|
|
|
// 账号不可登录，请使用您的专属网址
|
|
|
return this.$message.error(this.lang.Accountcannot);
|
11wqe1