调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -663,14 +663,39 @@ public class CwReimbursementInfoService {
                 } else {
                     projectDetail.setProjectName("");
                 }
+                if (StringUtils.isBlank(projectDetail.getUserName())){
+                    String name = infoMapper.findUserById(projectDetail.getUserId());
+                    projectDetail.setUserName(name);
+                    String office = infoMapper.findOfficeById(projectDetail.getDeptId());
+                    projectDetail.setDeptName(office);
+                }
+
             });
             dto.setDetailInfos(detailList);
             // 合同报销详情
             dto.setDetailInfoContracts(infoMapper.getContractDetailList(id));
             // 报告报销详情
-            dto.setDetailInfoReports(infoMapper.getReportDetailList(id));
+            List<CwReimbursementDetailInfoReport> detailInfoReports=infoMapper.getReportDetailList(id);
+            detailInfoReports.stream().forEach(detailInfoReport->{
+                if (StringUtils.isBlank(detailInfoReport.getUserName())){
+                    String name = infoMapper.findUserById(detailInfoReport.getUserId());
+                    detailInfoReport.setUserName(name);
+                    String office = infoMapper.findOfficeById(detailInfoReport.getDeptId());
+                    detailInfoReport.setDeptName(office);
+                }
+            });
+            dto.setDetailInfoReports(detailInfoReports);
             // 其他报销
-            dto.setDetailInfoOthers(infoMapper.getOtherDetailList(id));
+            List<CwReimbursementDetailInfoOther> otherDetailList=infoMapper.getOtherDetailList(id);
+            otherDetailList.stream().forEach(other->{
+                if (StringUtils.isBlank(other.getUserName())){
+                    String name = infoMapper.findUserById(other.getUserId());
+                    other.setUserName(name);
+                    String office = infoMapper.findOfficeById(other.getDeptId());
+                    other.setDeptName(office);
+                }
+            });
+            dto.setDetailInfoOthers(otherDetailList);
             // 采购报销
             dto.setDetailInfoProcured(infoMapper.getProcuredDetailList(id));
             dto.setHumanInfoProcured(infoMapper.getHumanProcuredDetailList(id));