Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
decf2668
Commit
decf2668
authored
Dec 09, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 用户信息返回
parent
f6387219
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
center-manage/app/base/controller/ctl.base.js
+0
-1
center-manage/app/base/db/impl/auth/userDao.js
+8
-8
No files found.
center-manage/app/base/controller/ctl.base.js
View file @
decf2668
...
@@ -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
);
}
}
...
...
center-manage/app/base/db/impl/auth/userDao.js
View file @
decf2668
...
@@ -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");
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment