|
@@ -2028,7 +2028,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
if(functionAllList.size()==0){
|
|
|
if(functionDeptList.size()>0){
|
|
|
deptIds = departmentList.stream().map(dp -> dp.getDepartmentId()).distinct().collect(Collectors.toList());
|
|
|
- deptIds.add(user.getDepartmentId());
|
|
|
}else {
|
|
|
deptIds=new ArrayList<>();
|
|
|
deptIds.add(-1);
|
|
@@ -3285,7 +3284,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
if(functionAllList.size()==0){
|
|
|
if(functionDeptList.size()>0){
|
|
|
deptIds = departmentList.stream().map(dp -> dp.getDepartmentId()).distinct().collect(Collectors.toList());
|
|
|
- deptIds.add(user.getDepartmentId());
|
|
|
+
|
|
|
}else {
|
|
|
deptIds=new ArrayList<>();
|
|
|
deptIds.add(-1);
|
|
@@ -3377,7 +3376,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
if(functionAllList.size()==0){
|
|
|
if(functionDeptList.size()>0){
|
|
|
deptIds = userDepartmentList.stream().map(dp -> dp.getDepartmentId()).distinct().collect(Collectors.toList());
|
|
|
- deptIds.add(targetUser.getDepartmentId());
|
|
|
}else {
|
|
|
deptIds=new ArrayList<>();
|
|
|
deptIds.add(-1);
|