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
b84eb377
Commit
b84eb377
authored
Jun 10, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
49709a65
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
13 deletions
+0
-13
StaffController.java
...com/gic/haoban/manage/web/controller/StaffController.java
+0
-13
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java
View file @
b84eb377
...
@@ -112,26 +112,13 @@ public class StaffController extends WebBaseController{
...
@@ -112,26 +112,13 @@ public class StaffController extends WebBaseController{
List
<
String
>
departmentIds
=
sonDepartmentList
.
stream
().
map
(
DepartmentDTO:
:
getDepartmentId
).
collect
(
Collectors
.
toList
());
List
<
String
>
departmentIds
=
sonDepartmentList
.
stream
().
map
(
DepartmentDTO:
:
getDepartmentId
).
collect
(
Collectors
.
toList
());
Page
<
StaffDTO
>
page
=
staffApiService
.
pageStaff
(
departmentIds
,
activeFlag
,
keyWord
,
pageInfo
);
Page
<
StaffDTO
>
page
=
staffApiService
.
pageStaff
(
departmentIds
,
activeFlag
,
keyWord
,
pageInfo
);
List
<
StaffDTO
>
list
=
page
.
getResult
();
List
<
StaffDTO
>
list
=
page
.
getResult
();
// if(list != null) {
// for (StaffDTO staffDTO : list) {
// logger.info("【成员列表】departmentId={},staffId={}",departmentId,staffDTO.getStaffId());
// StaffDepartmentRelatedDTO related = staffApiService.getDepartmentIdAndStaffId(departmentId,staffDTO.getStaffId());
// logger.info("【成员列表】related={}",JSON.toJSONString(related));
// if(related != null) {
// staffDTO.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
// staffDTO.setClerkCode(related.getClerkCode());
// }
// }
// }
logger
.
info
(
"【员工列表】page={}"
,
JSON
.
toJSONString
(
page
));
PageResult
<
StaffDTO
>
pageVo
=
new
PageResult
<>();
PageResult
<
StaffDTO
>
pageVo
=
new
PageResult
<>();
pageVo
.
setList
(
list
);
pageVo
.
setList
(
list
);
pageVo
.
setPageNum
(
page
.
getCurrentPage
());
pageVo
.
setPageNum
(
page
.
getCurrentPage
());
pageVo
.
setPages
(
page
.
getPages
());
pageVo
.
setPages
(
page
.
getPages
());
pageVo
.
setPageSize
(
page
.
getPageSize
());
pageVo
.
setPageSize
(
page
.
getPageSize
());
pageVo
.
setTotal
(
page
.
getTotalCount
());
pageVo
.
setTotal
(
page
.
getTotalCount
());
logger
.
info
(
"【员工列表】page={}"
,
1
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
pageVo
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
pageVo
);
}
}
...
...
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