Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
4db6566f
Commit
4db6566f
authored
Feb 22, 2021
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
f3a9b73c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
StaffController.java
...com/gic/haoban/manage/web/controller/StaffController.java
+2
-1
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java
View file @
4db6566f
...
@@ -466,7 +466,7 @@ public class StaffController extends WebBaseController{
...
@@ -466,7 +466,7 @@ public class StaffController extends WebBaseController{
List
<
String
>
departmentIds
=
relationList
.
stream
().
map
(
DepartmentShortDTO:
:
getDepartmentId
).
collect
(
Collectors
.
toList
());
List
<
String
>
departmentIds
=
relationList
.
stream
().
map
(
DepartmentShortDTO:
:
getDepartmentId
).
collect
(
Collectors
.
toList
());
Page
<
StaffDTO
>
page
=
staffApiService
.
pageStaff
(
departmentIds
,
null
,
null
,
pageInfo
);
Page
<
StaffDTO
>
page
=
staffApiService
.
pageStaff
(
departmentIds
,
null
,
null
,
pageInfo
);
List
<
StaffDTO
>
list
=
page
.
getResult
();
List
<
StaffDTO
>
list
=
page
.
getResult
();
logger
.
info
(
"page
={}"
,
JSON
.
toJSONString
(
page
));
logger
.
info
(
"page
s={},totalPage={}"
,
page
.
getPages
(),
page
.
getTotalPage
(
));
while
(
page
.
getPages
()
<
page
.
getTotalPage
()){
while
(
page
.
getPages
()
<
page
.
getTotalPage
()){
pageNum
++
;
pageNum
++
;
pageInfo
.
setPageNum
(
pageNum
);
pageInfo
.
setPageNum
(
pageNum
);
...
@@ -475,6 +475,7 @@ public class StaffController extends WebBaseController{
...
@@ -475,6 +475,7 @@ public class StaffController extends WebBaseController{
if
(
CollectionUtils
.
isNotEmpty
(
sonList
)){
if
(
CollectionUtils
.
isNotEmpty
(
sonList
)){
list
.
addAll
(
sonList
);
list
.
addAll
(
sonList
);
}
}
logger
.
info
(
"sonList={}"
,
sonList
.
size
());
}
}
List
<
StaffExportVO
>
voList
=
new
ArrayList
<>();
List
<
StaffExportVO
>
voList
=
new
ArrayList
<>();
for
(
StaffDTO
staffDTO
:
list
)
{
for
(
StaffDTO
staffDTO
:
list
)
{
...
...
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