Merge remote-tracking branch 'origin/1.2.0' into 1.2.0
commit
ab47c53214
|
@ -64,7 +64,7 @@ public class DeptService {
|
||||||
obj.setManagerId(dept.getManagerId());
|
obj.setManagerId(dept.getManagerId());
|
||||||
obj.setParentId(dept.getParentId());
|
obj.setParentId(dept.getParentId());
|
||||||
if (obj.getParentId() == 0) {
|
if (obj.getParentId() == 0) {
|
||||||
obj.setLevel(0);
|
obj.setLevel(1);
|
||||||
} else {
|
} else {
|
||||||
Dept one = deptRepository.findOne(obj.getParentId());
|
Dept one = deptRepository.findOne(obj.getParentId());
|
||||||
obj.setLevel(one.getLevel() + 1);
|
obj.setLevel(one.getLevel() + 1);
|
||||||
|
@ -77,7 +77,7 @@ public class DeptService {
|
||||||
obj.setManagerId(dept.getManagerId());
|
obj.setManagerId(dept.getManagerId());
|
||||||
obj.setParentId(dept.getParentId());
|
obj.setParentId(dept.getParentId());
|
||||||
if (obj.getParentId() == 0) {
|
if (obj.getParentId() == 0) {
|
||||||
obj.setLevel(0);
|
obj.setLevel(1);
|
||||||
} else {
|
} else {
|
||||||
Dept one = deptRepository.findOne(obj.getParentId());
|
Dept one = deptRepository.findOne(obj.getParentId());
|
||||||
obj.setLevel(one.getLevel() + 1);
|
obj.setLevel(one.getLevel() + 1);
|
||||||
|
|
Loading…
Reference in New Issue