|
@@ -5654,19 +5654,30 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Department finalDept = dept;
|
|
Department finalDept = dept;
|
|
- Optional<User> manager = userList.stream().filter(u -> u.getId().equals(finalDept.getManagerId())).findFirst();
|
|
|
|
|
|
+
|
|
|
|
+ String managerName = null;
|
|
|
|
+ if (finalDept != null) {
|
|
|
|
+ User manageUser = null;
|
|
|
|
+ Optional<User> manager = userList.stream().filter(u -> u.getId().equals(finalDept.getManagerId())).findFirst();
|
|
|
|
+ if (manager.isPresent()) {
|
|
|
|
+ manageUser = manager.get();
|
|
|
|
+ }
|
|
|
|
+ if (manageUser != null) {
|
|
|
|
+ managerName = manageUser.getName();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if(needCorpWxTranslate){
|
|
if(needCorpWxTranslate){
|
|
item.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
|
|
item.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
|
|
item.add(departmentService.exportWxDepartment(dept,departments));
|
|
item.add(departmentService.exportWxDepartment(dept,departments));
|
|
- item.add(manager.isPresent()?("$userName="+manager.get().getName()+"$"):"");
|
|
|
|
|
|
+ item.add(managerName != null?("$userName="+managerName+"$"):"");
|
|
}else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
|
|
}else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
|
|
item.add("$userName="+(map.get("name")==null?"":map.get("name"))+"$");
|
|
item.add("$userName="+(map.get("name")==null?"":map.get("name"))+"$");
|
|
item.add(departmentService.exportDdDepartment(dept,departments));
|
|
item.add(departmentService.exportDdDepartment(dept,departments));
|
|
- item.add(manager.isPresent()?("$userName="+manager.get().getName()+"$"):"");
|
|
|
|
|
|
+ item.add(managerName != null?("$userName="+managerName+"$"):"");
|
|
}else {
|
|
}else {
|
|
item.add((String) map.get("name"));
|
|
item.add((String) map.get("name"));
|
|
item.add(departmentService.getSupDepartment(dept,departments));
|
|
item.add(departmentService.getSupDepartment(dept,departments));
|
|
- item.add(manager.isPresent()?manager.get().getName():"");
|
|
|
|
|
|
+ item.add(managerName != null?managerName:"");
|
|
}
|
|
}
|
|
item.add((String) map.get("projectCode"));
|
|
item.add((String) map.get("projectCode"));
|
|
item.add((String) map.get("project"));
|
|
item.add((String) map.get("project"));
|