|
@@ -1151,6 +1151,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id").in("dept_id", allMyManagedDeptIds));
|
|
List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id").in("dept_id", allMyManagedDeptIds));
|
|
deptRelatedProjectIds = projectList.stream().map(Project::getId).collect(Collectors.toList());
|
|
deptRelatedProjectIds = projectList.stream().map(Project::getId).collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
+ if(functionDpartList.size()>0){
|
|
|
|
+ if(functionTimeList.size()>0||functionCostList.size()>0){
|
|
|
|
+ deptIds.addAll(allMyManagedDeptIds);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
//没有查看全公司的权限 只能先判断当前部门/父级别是否在负责部门才能获取数据
|
|
//没有查看全公司的权限 只能先判断当前部门/父级别是否在负责部门才能获取数据
|
|
if(deptId!=null){
|
|
if(deptId!=null){
|
|
Optional<Department> first = allDepartmentList.stream().filter(ad -> ad.getDepartmentId().equals(deptId)).findFirst();
|
|
Optional<Department> first = allDepartmentList.stream().filter(ad -> ad.getDepartmentId().equals(deptId)).findFirst();
|