Commit decf2668 by Sxy

fix: 用户信息返回

parent f6387219
...@@ -30,7 +30,6 @@ class CtlBase { ...@@ -30,7 +30,6 @@ class CtlBase {
} }
async findAndCountAll(pobj, qobj, req) { async findAndCountAll(pobj, qobj, req) {
// 设置查询条件 // 设置查询条件
console.log(pobj);
const rs = await this.service.findAndCountAll(pobj); const rs = await this.service.findAndCountAll(pobj);
return system.getResult(rs); return system.getResult(rs);
} }
......
...@@ -57,13 +57,13 @@ class UserDao extends Dao { ...@@ -57,13 +57,13 @@ class UserDao extends Dao {
return tUser; return tUser;
} }
async setAccount(user, account, t) { async setAccount(user, account, t) {
const user = await user.setAccount(account, { transaction: t }); const data = await user.setAccount(account, { transaction: t });
return user; return data;
} }
async setApp(user, app, t) { async setApp(user, app, t) {
// 按照APPId,获取app对象 // 按照APPId,获取app对象
const user = await user.setApp(app, { transaction: t }); const data = await user.setApp(app, { transaction: t });
return user; return data;
} }
extraModelFilter() { extraModelFilter() {
return { return {
...@@ -115,10 +115,10 @@ class UserDao extends Dao { ...@@ -115,10 +115,10 @@ class UserDao extends Dao {
} }
return user; return user;
} }
async findAndCountAll(qobj, t) { // async findAndCountAll(qobj, t) {
const users = await super.findAndCountAll(qobj, t); // const users = await super.findAndCountAll(qobj, t);
return users; // return users;
} // }
async preCreate(u) { async preCreate(u) {
// var roles=await this.db.models.role.findAll({where:{id:{[this.db.Op.like]:u.roles}}}); // var roles=await this.db.models.role.findAll({where:{id:{[this.db.Op.like]:u.roles}}});
// console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); // console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment