Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
T
ts-api-demo
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wmvm
ts-api-demo
Commits
1a4f0695
Commit
1a4f0695
authored
Sep 06, 2024
by
ml
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
1e2908b8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
aclDepartment.service.ts
src/functional/mvc/service/aclDepartment.service.ts
+2
-2
No files found.
src/functional/mvc/service/aclDepartment.service.ts
View file @
1a4f0695
...
...
@@ -242,7 +242,7 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag
uids
.
push
(
item
.
user_id
);
}
//有则分页查询部门用户
pageData
=
await
getDpUserPageData
(
dIds
,
page
,
size
,
[]
);
pageData
=
await
getDpUserPageData
(
dIds
,
page
,
size
,
uids
);
for
(
let
oneItem
of
pageData
.
rows
)
{
oneItem
.
account
=
userMap
[
oneItem
.
user_id
]
?
userMap
[
oneItem
.
user_id
].
account
:
""
;
oneItem
.
phone
=
userMap
[
oneItem
.
user_id
]
?
userMap
[
oneItem
.
user_id
].
phone
:
""
;
...
...
@@ -302,7 +302,7 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag
async
function
getDpUserPageData
(
dIds
:
string
,
page
:
number
,
size
:
number
,
uids
:
number
[])
{
let
where
=
{};
if
(
dIds
)
{
where
[
'department_id'
]
=
dIds
;
where
[
'department_id'
]
=
{[
madAdminOrmDB
.
Op
.
like
]:
`
${
dIds
}
%`
}
;
}
if
(
uids
.
length
)
{
where
[
'user_id'
]
=
{
[
madAdminOrmDB
.
Op
.
in
]:
uids
}
...
...
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