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
dc69da0f
Commit
dc69da0f
authored
Feb 15, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
7c6a13b9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
10 deletions
+2
-10
DepartmentContoller.java
...gic/haoban/manage/web/controller/DepartmentContoller.java
+2
-10
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java
View file @
dc69da0f
...
...
@@ -11,10 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
import
com.alibaba.fastjson.JSONArray
;
import
com.gic.api.base.commons.Page
;
import
com.gic.enterprise.api.dto.GicTreeDTO
;
import
com.gic.enterprise.api.dto.StoreDTO
;
import
com.gic.enterprise.api.service.DepartmentService
;
import
com.gic.enterprise.api.service.StoreGroupService
;
import
com.gic.enterprise.api.service.StoreService
;
import
com.gic.haoban.base.api.common.BasePageInfo
;
import
com.gic.haoban.base.api.common.Constant
;
import
com.gic.haoban.common.utils.AuthRequestUtil
;
...
...
@@ -30,11 +27,6 @@ import com.gic.haoban.manage.web.vo.LoginVO;
public
class
DepartmentContoller
extends
WebBaseController
{
@Autowired
private
DepartmentApiService
departmentApiService
;
@Autowired
private
DepartmentService
departmentService
;
@Autowired
private
StoreService
storeService
;
@Autowired
private
StoreGroupService
storeGroupService
;
...
...
@@ -185,10 +177,10 @@ public class DepartmentContoller extends WebBaseController{
}
@RequestMapping
(
"unbind-department-list"
)
public
HaobanResponse
unbindDepartmentList
(
String
departmentId
,
String
enterpriseId
)
{
public
HaobanResponse
unbindDepartmentList
(
String
departmentId
,
String
enterpriseId
,
Integer
type
)
{
List
<
String
>
list
=
new
ArrayList
<
String
>();
list
.
add
(
departmentId
);
List
<
GicTreeDTO
>
departmentList
=
storeGroupService
.
listGicTree
(
enterpriseId
,
null
,
departmentId
);
List
<
GicTreeDTO
>
departmentList
=
storeGroupService
.
listGicTree
(
enterpriseId
,
type
,
departmentId
);
List
<
DepartmentDTO
>
dtoList
=
new
ArrayList
<
DepartmentDTO
>();
for
(
GicTreeDTO
departmentDTO
:
departmentList
)
{
...
...
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