报销bug修复

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -432,44 +432,44 @@ public class CwReimbursementInfoService {
         SaveInfoDto dto = new SaveInfoDto();
         // 查询基础信息表
         CwReimbursementInfo info = infoMapper.selectById(id);
-        BeanUtils.copyProperties(info, dto);
         if (ObjectUtil.isNotEmpty(info)){
+            BeanUtils.copyProperties(info, dto);
             if(StringUtils.isNotBlank(info.getDepartment())) {
                 Office byId = officeService.getById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {
                     dto.setDepartmentName(byId.getName());
                 }
             }
-        }
 
-        // 查询详情列表
+            // 查询详情列表
 //        LambdaQueryWrapper<CwReimbursementDetailInfo> detailInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
 //        detailInfoLambdaQueryWrapper.eq(CwReimbursementDetailInfo::getInfoId, id);
 //        detailInfoLambdaQueryWrapper.orderByAsc(CwReimbursementDetailInfo::getNumber);
 //        List<CwReimbursementDetailInfo> detailInfos = detailInfoMapper.selectList(detailInfoLambdaQueryWrapper);
-        // 项目报销详情
-        dto.setDetailInfos(infoMapper.getDetailList(id));
-        // 合同报销详情
-        dto.setDetailInfoContracts(infoMapper.getContractDetailList(id));
-        // 报告报销详情
-        dto.setDetailInfoReports(infoMapper.getReportDetailList(id));
-        // 其他报销
-        dto.setDetailInfoOthers(infoMapper.getOtherDetailList(id));
-        // 采购报销
-        dto.setDetailInfoProcured(infoMapper.getProcuredDetailList(id));
-        // 查询专用发票信息列表
-        LambdaQueryWrapper<CwReimbursementAmountInfo> amountInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        amountInfoLambdaQueryWrapper.eq(CwReimbursementAmountInfo::getInfoId, id);
-        List<CwReimbursementAmountInfo> amountInfos = amountInfoMapper.selectList(amountInfoLambdaQueryWrapper);
-        dto.setAmountInfos(amountInfos);
-        // 查询附件信息
-        List<WorkAttachmentDto> files = infoMapper.findFiles(id);
-        if (CollectionUtils.isNotEmpty(files)) {
-            for (WorkAttachmentDto i : files) {
-                i.setCreateBy(UserUtils.get(i.getBy()));
+            // 项目报销详情
+            dto.setDetailInfos(infoMapper.getDetailList(id));
+            // 合同报销详情
+            dto.setDetailInfoContracts(infoMapper.getContractDetailList(id));
+            // 报告报销详情
+            dto.setDetailInfoReports(infoMapper.getReportDetailList(id));
+            // 其他报销
+            dto.setDetailInfoOthers(infoMapper.getOtherDetailList(id));
+            // 采购报销
+            dto.setDetailInfoProcured(infoMapper.getProcuredDetailList(id));
+            // 查询专用发票信息列表
+            LambdaQueryWrapper<CwReimbursementAmountInfo> amountInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            amountInfoLambdaQueryWrapper.eq(CwReimbursementAmountInfo::getInfoId, id);
+            List<CwReimbursementAmountInfo> amountInfos = amountInfoMapper.selectList(amountInfoLambdaQueryWrapper);
+            dto.setAmountInfos(amountInfos);
+            // 查询附件信息
+            List<WorkAttachmentDto> files = infoMapper.findFiles(id);
+            if (CollectionUtils.isNotEmpty(files)) {
+                for (WorkAttachmentDto i : files) {
+                    i.setCreateBy(UserUtils.get(i.getBy()));
+                }
             }
+            dto.setFiles(files);
         }
-        dto.setFiles(files);
         return dto;
     }