|
@@ -6814,7 +6814,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
if (curUser.isPresent()) {
|
|
|
Integer userDeptId = curUser.get().getDepartmentId();
|
|
|
if(userDeptId != null && !userDeptId.equals(dept.getDepartmentId())){
|
|
|
- item.add("协助部门");
|
|
|
+ Optional<Department> findDept = departments.stream().filter(department -> department.getDepartmentId().equals(userDeptId)).findFirst();
|
|
|
+ if (findDept.isPresent()) {
|
|
|
+ item.add(findDept.get().getDepartmentName());
|
|
|
+ } else {
|
|
|
+ item.add("");
|
|
|
+ }
|
|
|
} else {
|
|
|
item.add("");
|
|
|
}
|