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
ac462739
Commit
ac462739
authored
Feb 27, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
10e655d5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletions
+20
-1
DepartmentDTO.java
...ain/java/com/gic/haoban/manage/api/dto/DepartmentDTO.java
+10
-0
DepartmentContoller.java
...gic/haoban/manage/web/controller/DepartmentContoller.java
+10
-1
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/DepartmentDTO.java
View file @
ac462739
...
...
@@ -38,6 +38,8 @@ public class DepartmentDTO implements Serializable {
private
String
wxEnterpriseId
;
private
Integer
type
;
private
String
storeCode
;
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -176,6 +178,14 @@ public class DepartmentDTO implements Serializable {
public
void
setType
(
Integer
type
)
{
this
.
type
=
type
;
}
public
String
getStoreCode
()
{
return
storeCode
;
}
public
void
setStoreCode
(
String
storeCode
)
{
this
.
storeCode
=
storeCode
;
}
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java
View file @
ac462739
...
...
@@ -328,8 +328,17 @@ public class DepartmentContoller extends WebBaseController{
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
Integer
recycleFlag
=
1
;
Page
<
DepartmentDTO
>
page
=
departmentApiService
.
pageDepartmentByParams
(
pageInfo
,
wxEnterpriseId
,
keyWord
,
storeFlag
,
recycleFlag
);
List
<
DepartmentDTO
>
list
=
page
.
getResult
();
for
(
DepartmentDTO
departmentDTO
:
list
)
{
if
(
departmentDTO
.
getIsStore
()
!=
null
&&
departmentDTO
.
getIsStore
()
==
1
){
StoreDTO
store
=
storeService
.
getStore
(
departmentDTO
.
getRelatedId
());
if
(
store
!=
null
){
departmentDTO
.
setStoreCode
(
store
.
getStoreCode
());
}
}
}
PageResult
<
DepartmentDTO
>
pageVo
=
new
PageResult
<>();
pageVo
.
setList
(
page
.
getResult
()
);
pageVo
.
setList
(
list
);
pageVo
.
setPageNum
(
page
.
getCurrentPage
());
pageVo
.
setPages
(
page
.
getPages
());
pageVo
.
setPageSize
(
page
.
getPageSize
());
...
...
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