diff --git a/server/api/UserApi.ts b/server/api/UserApi.ts index 4cad6fb..f1fcfbf 100644 --- a/server/api/UserApi.ts +++ b/server/api/UserApi.ts @@ -68,7 +68,7 @@ export default class UserApi extends BaseApi { code: 400, } - const user = (User.findByUserName(args.account as string) || User.findById(args.account as string)) as User + const user = User.findByAccount(args.account as string) as User if (user == null) return { msg: "賬號或密碼錯誤", code: 400, diff --git a/server/data/User.ts b/server/data/User.ts index beba3f9..96f3709 100644 --- a/server/data/User.ts +++ b/server/data/User.ts @@ -103,6 +103,9 @@ export default class User { console.error(chalk.red(`警告: 查询 username = ${userName} 时, 查询到多个相同用户名的用户`)) return new User(beans[0]) } + static findByAccount(account: string) { + return User.findByUserName(account) || User.findById(account) + } declare bean: UserBean constructor(bean: UserBean) {