入库修复附件展示bug

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -868,19 +868,28 @@ public class WareHouseBasicService {
         WarehouseUpHi hiByHiId = warehouseUpHiMapper.findHiByHiId(hiId); // 根据历史表id查询历史表数据
         if (ObjectUtil.isNotEmpty(hiByHiId) && StringUtils.isNotBlank(hiByHiId.getJsonData())) {
             wareHouseDto = JSON.parseObject(hiByHiId.getJsonData(), WareHouseDto.class); // json字符串解析为java对象
-            // 入库详情中的附件数据获取。
-            // 在这里要重新获取一下入库详情附件的原因是，json字符串中的附件createBy值存储不正确，所以重新获取一下
-            if(ObjectUtil.isNotEmpty(wareHouseDto) && CollectionUtil.isNotEmpty(wareHouseDto.getWareHouse())) {
-                wareHouseDto.getWareHouse().forEach(detailed->{
-                    List<WorkAttachmentDto> acList = detailedMapper.getByAttachmentId(detailed.getId());
-                    if (CollectionUtils.isNotEmpty(acList)) {
-                        for (WorkAttachmentDto i : acList) {
-                            i.setCreateBy(UserUtils.get(i.getBy()));
+            if (ObjectUtil.isNotEmpty(wareHouseDto)) {
+                // 入库详情中的附件数据获取。
+                // 在这里要重新获取一下入库详情附件的原因是，json字符串中的附件createBy值存储不正确，所以重新获取一下
+                if(CollectionUtil.isNotEmpty(wareHouseDto.getWareHouse())) {
+                    wareHouseDto.getWareHouse().forEach(detailed->{
+                        List<WorkAttachmentDto> acList = detailedMapper.getByAttachmentId(detailed.getId());
+                        if (CollectionUtils.isNotEmpty(acList)) {
+                            for (WorkAttachmentDto i : acList) {
+                                i.setCreateBy(UserUtils.get(i.getBy()));
+                            }
                         }
-                    }
-                    detailed.setFileInfoLost(acList);
-                });
+                        detailed.setFileInfoLost(acList);
+                    });
+                }
+                // 入库附件同上
+                if(CollectionUtil.isNotEmpty(wareHouseDto.getFiles())) {
+                    wareHouseDto.getFiles().forEach(file->{
+                        file.setCreateBy(UserUtils.get(file.getBy()));
+                    });
+                }
             }
+
         }
         return wareHouseDto;
     }
@@ -891,18 +900,26 @@ public class WareHouseBasicService {
         WarehouseUpHi hiByHiId = warehouseUpHiMapper.findLastHiByid(warehouseId); // 根据入库表id查询最近的一个修改历史
         if (ObjectUtil.isNotEmpty(hiByHiId) && StringUtils.isNotBlank(hiByHiId.getJsonData())) {
             wareHouseDto = JSON.parseObject(hiByHiId.getJsonData(), WareHouseDto.class); // json字符串解析为java对象
-            // 入库详情中的附件数据获取。
-            // 在这里要重新获取一下入库详情附件的原因是，json字符串中的附件createBy值存储不正确，所以重新获取一下
-            if(ObjectUtil.isNotEmpty(wareHouseDto) && CollectionUtil.isNotEmpty(wareHouseDto.getWareHouse())) {
-                wareHouseDto.getWareHouse().forEach(detailed->{
-                    List<WorkAttachmentDto> acList = detailedMapper.getByAttachmentId(detailed.getId());
-                    if (CollectionUtils.isNotEmpty(acList)) {
-                        for (WorkAttachmentDto i : acList) {
-                            i.setCreateBy(UserUtils.get(i.getBy()));
+            if (ObjectUtil.isNotEmpty(wareHouseDto)) {
+                // 入库详情中的附件数据获取。
+                // 在这里要重新获取一下入库详情附件的原因是，json字符串中的附件createBy值存储不正确，所以重新获取一下
+                if(CollectionUtil.isNotEmpty(wareHouseDto.getWareHouse())) {
+                    wareHouseDto.getWareHouse().forEach(detailed->{
+                        List<WorkAttachmentDto> acList = detailedMapper.getByAttachmentId(detailed.getId());
+                        if (CollectionUtils.isNotEmpty(acList)) {
+                            for (WorkAttachmentDto i : acList) {
+                                i.setCreateBy(UserUtils.get(i.getBy()));
+                            }
                         }
-                    }
-                    detailed.setFileInfoLost(acList);
-                });
+                        detailed.setFileInfoLost(acList);
+                    });
+                }
+                // 入库附件同上
+                if(CollectionUtil.isNotEmpty(wareHouseDto.getFiles())) {
+                    wareHouseDto.getFiles().forEach(file->{
+                        file.setCreateBy(UserUtils.get(file.getBy()));
+                    });
+                }
             }
         }
         return wareHouseDto;