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
82aa914d
Commit
82aa914d
authored
Sep 09, 2021
by
QianQiXiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据状态来导出通讯录
parent
94d2b608
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
StaffController.java
...com/gic/haoban/manage/web/controller/StaffController.java
+2
-7
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java
View file @
82aa914d
...
@@ -490,11 +490,6 @@ public class StaffController extends WebBaseController {
...
@@ -490,11 +490,6 @@ public class StaffController extends WebBaseController {
pageInfo
.
setPageNum
(
pageNum
);
pageInfo
.
setPageNum
(
pageNum
);
pageInfo
.
setPageSize
(
pageSize
);
pageInfo
.
setPageSize
(
pageSize
);
String
departmentId
=
request
.
getParameter
(
"departmentId"
);
String
departmentId
=
request
.
getParameter
(
"departmentId"
);
String
stringActiveFlag
=
request
.
getParameter
(
"activeFlag"
);
Integer
activeFlag
=
null
;
if
(
stringActiveFlag
!=
null
)
{
activeFlag
=
Integer
.
parseInt
(
stringActiveFlag
);
}
List
<
String
>
departmentIdSet
=
new
ArrayList
<>();
List
<
String
>
departmentIdSet
=
new
ArrayList
<>();
departmentIdSet
.
add
(
departmentId
);
departmentIdSet
.
add
(
departmentId
);
LoginDTO
login
=
(
LoginDTO
)
AuthRequestUtil
.
getLoginUser
();
LoginDTO
login
=
(
LoginDTO
)
AuthRequestUtil
.
getLoginUser
();
...
@@ -507,13 +502,13 @@ public class StaffController extends WebBaseController {
...
@@ -507,13 +502,13 @@ public class StaffController extends WebBaseController {
List
<
DepartmentDTO
>
relationList
=
departmentApiService
.
listSonByDepartmentIds
(
departmentIdSet
,
wxEnterpriseId
);
List
<
DepartmentDTO
>
relationList
=
departmentApiService
.
listSonByDepartmentIds
(
departmentIdSet
,
wxEnterpriseId
);
Map
<
String
,
DepartmentDTO
>
departmentMap
=
relationList
.
stream
().
collect
(
Collectors
.
toMap
(
DepartmentDTO:
:
getDepartmentId
,
s
->
s
));
Map
<
String
,
DepartmentDTO
>
departmentMap
=
relationList
.
stream
().
collect
(
Collectors
.
toMap
(
DepartmentDTO:
:
getDepartmentId
,
s
->
s
));
List
<
String
>
departmentIds
=
relationList
.
stream
().
map
(
DepartmentDTO:
:
getDepartmentId
).
collect
(
Collectors
.
toList
());
List
<
String
>
departmentIds
=
relationList
.
stream
().
map
(
DepartmentDTO:
:
getDepartmentId
).
collect
(
Collectors
.
toList
());
Page
<
StaffDTO
>
page
=
staffApiService
.
pageStaff
(
departmentIds
,
activeFlag
,
null
,
pageInfo
);
Page
<
StaffDTO
>
page
=
staffApiService
.
pageStaff
(
departmentIds
,
null
,
null
,
pageInfo
);
List
<
StaffDTO
>
list
=
page
.
getResult
();
List
<
StaffDTO
>
list
=
page
.
getResult
();
logger
.
info
(
"pages={},totalPage={}"
,
page
.
getCurrentPage
(),
page
.
getTotalPage
());
logger
.
info
(
"pages={},totalPage={}"
,
page
.
getCurrentPage
(),
page
.
getTotalPage
());
while
(
page
.
getCurrentPage
()
<
page
.
getTotalPage
())
{
while
(
page
.
getCurrentPage
()
<
page
.
getTotalPage
())
{
pageNum
++;
pageNum
++;
pageInfo
.
setPageNum
(
pageNum
);
pageInfo
.
setPageNum
(
pageNum
);
page
=
staffApiService
.
pageStaff
(
departmentIds
,
activeFlag
,
null
,
pageInfo
);
page
=
staffApiService
.
pageStaff
(
departmentIds
,
null
,
null
,
pageInfo
);
List
<
StaffDTO
>
sonList
=
page
.
getResult
();
List
<
StaffDTO
>
sonList
=
page
.
getResult
();
if
(
CollectionUtils
.
isNotEmpty
(
sonList
))
{
if
(
CollectionUtils
.
isNotEmpty
(
sonList
))
{
list
.
addAll
(
sonList
);
list
.
addAll
(
sonList
);
...
...
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