diff --git a/app/permission/api/login.js b/app/permission/api/login.js index 3aa1e6b..03c07fe 100644 --- a/app/permission/api/login.js +++ b/app/permission/api/login.js @@ -12,8 +12,6 @@ module.exports = { token: await $components.jwt.sign({}) }, "登录成功") } - - return $res.error({}, "登录失败") } diff --git a/app/permission/components/login/accountPassword.js b/app/permission/components/login/accountPassword.js index 78f2c32..2e97f70 100644 --- a/app/permission/components/login/accountPassword.js +++ b/app/permission/components/login/accountPassword.js @@ -3,11 +3,12 @@ * 账号密码登陆 * @param {string} data.account 账号. * @param {string} data.password 密码. + * @param {string} data.oid 机构id * @return {object} res 验证是否通过. */ module.exports = async (data) => { - const {account, password} = data - const User = await app.db.table("User").where({account}).find() + const {account, password, oid} = data + const User = await app.db.table("User").where({account, to_oid: oid}).find() if (!User) return false const {salt} = User const ver = app.components.encrypt.cryptPwdVerification(password, salt, User.password)