Просмотр исходного кода

产业供地bug INSLAND-7修复

huZhiHao 5 лет назад
Родитель
Сommit
83f287ff69

+ 9 - 3
src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -754,10 +754,16 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 
         IndustrialLandSupplyDetail entity = industrialLandSupplyDetailDao.selectById(id);
         //文件
-        List<Attachment> attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, entity.getId(), null);
+        List<Attachment> attachments = null;
+        //基本信息附件
+        attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY, entity.getId(), null);
         if (null != attachments && attachments.size() > 0) {
-            FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), attachments.get(0).getDownload_uri());
-            entity.setFileDown(fileDown);
+            List<FileDown> fileList = new ArrayList<>();
+            for (Attachment attachment : attachments) {
+                FileDown fileDown = new FileDown(attachment.getId(), attachment.getFile_name(), attachment.getFile_url(), attachment.getDownload_uri());
+                fileList.add(fileDown);
+            }
+            entity.setFileList(fileList);
         }
         //补充附件
         attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.INDUSTRIAL_LAND_SUPPLY_COMMERCE_SUPPLEMENT, entity.getId(), null);