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
cea4fd02
Commit
cea4fd02
authored
Feb 26, 2020
by
huangZW
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://115.159.76.241/haoban3.0/haoban-manage3.0.git
into developer
parents
8409a10b
0886c396
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
DepartmentContoller.java
...gic/haoban/manage/web/controller/DepartmentContoller.java
+2
-1
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java
View file @
cea4fd02
...
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.Page
;
import
com.gic.enterprise.api.dto.GicTreeDTO
;
import
com.gic.enterprise.api.dto.GicTreeDTO
;
...
@@ -231,6 +231,7 @@ public class DepartmentContoller extends WebBaseController{
...
@@ -231,6 +231,7 @@ public class DepartmentContoller extends WebBaseController{
department
.
setChainName
(
parent
.
getChainName
()
+
Constant
.
NAME_SEPARATOR
+
parent
.
getDepartmentName
());
department
.
setChainName
(
parent
.
getChainName
()
+
Constant
.
NAME_SEPARATOR
+
parent
.
getDepartmentName
());
department
.
setLevel
(
parent
.
getLevel
()
+
1
);
department
.
setLevel
(
parent
.
getLevel
()
+
1
);
department
.
setSort
(
departmentQO
.
getSort
());
department
.
setSort
(
departmentQO
.
getSort
());
logger
.
info
(
"【部门修改】department={}"
,
JSON
.
toJSONString
(
department
));
handerSonDepartment
(
departmentQO
.
getCurrDepartment
());
handerSonDepartment
(
departmentQO
.
getCurrDepartment
());
HaobanResponse
hr
=
departmentApiService
.
edit
(
department
);
HaobanResponse
hr
=
departmentApiService
.
edit
(
department
);
...
...
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