Bladeren bron

修复日报导出bug

seyason 1 jaar geleden
bovenliggende
commit
e5f1d8c010

+ 15 - 4
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5654,19 +5654,30 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                 }
                 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){
                     item.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
                     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){
                     item.add("$userName="+(map.get("name")==null?"":map.get("name"))+"$");
                     item.add(departmentService.exportDdDepartment(dept,departments));
-                    item.add(manager.isPresent()?("$userName="+manager.get().getName()+"$"):"");
+                    item.add(managerName != null?("$userName="+managerName+"$"):"");
                 }else  {
                     item.add((String) map.get("name"));
                     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("project"));