|
@@ -3848,17 +3848,19 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
|
|
|
//查询本单位还是本单位及子孙级
|
|
|
public List<Integer> isQueryAll(Integer queryAll) {
|
|
|
List<Integer> deptList = new ArrayList<>();
|
|
|
+ Long deptId = SecurityUtils.getDeptId();
|
|
|
//查询全部
|
|
|
if (queryAll.equals(-1)) {
|
|
|
- Long deptId = SecurityUtils.getDeptId();
|
|
|
//获取到子孙级部门id
|
|
|
if (deptService.hasChildByDeptId(deptId)) {
|
|
|
List<Integer> children = getDeptChildren(deptId);
|
|
|
System.err.println(children.size());
|
|
|
deptList.addAll(children);
|
|
|
}
|
|
|
+ deptList.add(Math.toIntExact(deptId));
|
|
|
//指定部门
|
|
|
} else {
|
|
|
+ deptList.add(Math.toIntExact(deptId));
|
|
|
deptList.add(queryAll);
|
|
|
}
|
|
|
return deptList;
|