diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f4dc14f..a5f9ad1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -98,7 +98,7 @@
     /**
      * 表单生成及打印
      */
-    TEMPLATE_FILE_NULL(2700, "模板文件不能为空"),
+    MODULE_CONFIG_PRINT(2700, "模板文件配置为空"),
     FOREIGN_KEY_FIELD_NULL(2701, "模块外键字段为空"),
     FOREIGN_KEY_VALUE_NULL(2702, "模块外键值为空"),
     BIND_KEY_LIST_NULL(2703, "绑定管理的列表为空"),

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f4dc14f..a5f9ad1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -98,7 +98,7 @@
     /**
      * 表单生成及打印
      */
-    TEMPLATE_FILE_NULL(2700, "模板文件不能为空"),
+    MODULE_CONFIG_PRINT(2700, "模板文件配置为空"),
     FOREIGN_KEY_FIELD_NULL(2701, "模块外键字段为空"),
     FOREIGN_KEY_VALUE_NULL(2702, "模块外键值为空"),
     BIND_KEY_LIST_NULL(2703, "绑定管理的列表为空"),
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
index 054e3f0..f2551fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
@@ -62,7 +62,7 @@
         if (StringUtils.isEmpty(beDownloadedFileName)) {
             return;
         }
-        if (CollectionUtil.isEmpty(electronicImageList)) {
+        if (CollectionUtil.isEmpty(beDownloadedFileNames)) {
             beDownloadedFileNames = new ArrayList<>();
         }
         beDownloadedFileNames.add(beDownloadedFileName);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f4dc14f..a5f9ad1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -98,7 +98,7 @@
     /**
      * 表单生成及打印
      */
-    TEMPLATE_FILE_NULL(2700, "模板文件不能为空"),
+    MODULE_CONFIG_PRINT(2700, "模板文件配置为空"),
     FOREIGN_KEY_FIELD_NULL(2701, "模块外键字段为空"),
     FOREIGN_KEY_VALUE_NULL(2702, "模块外键值为空"),
     BIND_KEY_LIST_NULL(2703, "绑定管理的列表为空"),
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
index 054e3f0..f2551fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
@@ -62,7 +62,7 @@
         if (StringUtils.isEmpty(beDownloadedFileName)) {
             return;
         }
-        if (CollectionUtil.isEmpty(electronicImageList)) {
+        if (CollectionUtil.isEmpty(beDownloadedFileNames)) {
             beDownloadedFileNames = new ArrayList<>();
         }
         beDownloadedFileNames.add(beDownloadedFileName);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
index ea2772a..699a18c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
@@ -78,7 +78,7 @@
         //主附件信息
         List<BizEquipmentBorrowAttachment> attachmentList = request.getAttachmentList();
         attachmentList.forEach(equip -> equip.setBorrowId(request.getId()));
-        if(!attachmentService.saveBatch(attachmentList)){
+        if (!attachmentService.saveBatch(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
         }
         BorrowSaveResponse saveResponse = new BorrowSaveResponse();
@@ -120,7 +120,14 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentBorrowAttachment : borrowInfo.getAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName() + "," + bizEquipmentBorrowAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
@@ -131,22 +138,28 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getReturnAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentLendAttachment : borrowInfo.getReturnAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName() + "," + bizEquipmentLendAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
                 }
                 map.put("returnCatalogueNameStr", catalogueNameStr);
             }
-            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,null, map, exportDTO.isPdf(), response);
+            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
         }
-
     }
 
     @Override
     public ReturnDTO saveBorrowReturn(BizEquipmentBorrowReturnRequest request) {
         BizEquipmentBorrow borrowInfo = ConvertUtils.sourceToTarget(request, BizEquipmentBorrow.class);
-        if(this.baseMapper.updateById(borrowInfo) <= 0){
+        if (this.baseMapper.updateById(borrowInfo) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         //更新主附件信息
@@ -158,7 +171,7 @@
             attachment.setReturnFlag(1);
             attachmentList.add(attachment);
         });
-        if(!attachmentService.updateBatchById(attachmentList)){
+        if (!attachmentService.updateBatchById(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success();
@@ -216,7 +229,7 @@
     private void removeRelationData(Long borrowId) {
         QueryWrapper<BizEquipmentBorrowAttachment> wrapper = new QueryWrapper<>();
         wrapper.eq("borrow_id", borrowId);
-        if(attachmentService.remove(wrapper)){
+        if (attachmentService.remove(wrapper)) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -227,7 +240,7 @@
         attachmentList.forEach(attachment -> {
             attachment.setBorrowId(request.getId());
         });
-        if(attachmentService.saveBatch(request.getAttachmentList())){
+        if (attachmentService.saveBatch(request.getAttachmentList())) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f4dc14f..a5f9ad1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -98,7 +98,7 @@
     /**
      * 表单生成及打印
      */
-    TEMPLATE_FILE_NULL(2700, "模板文件不能为空"),
+    MODULE_CONFIG_PRINT(2700, "模板文件配置为空"),
     FOREIGN_KEY_FIELD_NULL(2701, "模块外键字段为空"),
     FOREIGN_KEY_VALUE_NULL(2702, "模块外键值为空"),
     BIND_KEY_LIST_NULL(2703, "绑定管理的列表为空"),
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
index 054e3f0..f2551fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
@@ -62,7 +62,7 @@
         if (StringUtils.isEmpty(beDownloadedFileName)) {
             return;
         }
-        if (CollectionUtil.isEmpty(electronicImageList)) {
+        if (CollectionUtil.isEmpty(beDownloadedFileNames)) {
             beDownloadedFileNames = new ArrayList<>();
         }
         beDownloadedFileNames.add(beDownloadedFileName);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
index ea2772a..699a18c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
@@ -78,7 +78,7 @@
         //主附件信息
         List<BizEquipmentBorrowAttachment> attachmentList = request.getAttachmentList();
         attachmentList.forEach(equip -> equip.setBorrowId(request.getId()));
-        if(!attachmentService.saveBatch(attachmentList)){
+        if (!attachmentService.saveBatch(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
         }
         BorrowSaveResponse saveResponse = new BorrowSaveResponse();
@@ -120,7 +120,14 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentBorrowAttachment : borrowInfo.getAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName() + "," + bizEquipmentBorrowAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
@@ -131,22 +138,28 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getReturnAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentLendAttachment : borrowInfo.getReturnAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName() + "," + bizEquipmentLendAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
                 }
                 map.put("returnCatalogueNameStr", catalogueNameStr);
             }
-            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,null, map, exportDTO.isPdf(), response);
+            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
         }
-
     }
 
     @Override
     public ReturnDTO saveBorrowReturn(BizEquipmentBorrowReturnRequest request) {
         BizEquipmentBorrow borrowInfo = ConvertUtils.sourceToTarget(request, BizEquipmentBorrow.class);
-        if(this.baseMapper.updateById(borrowInfo) <= 0){
+        if (this.baseMapper.updateById(borrowInfo) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         //更新主附件信息
@@ -158,7 +171,7 @@
             attachment.setReturnFlag(1);
             attachmentList.add(attachment);
         });
-        if(!attachmentService.updateBatchById(attachmentList)){
+        if (!attachmentService.updateBatchById(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success();
@@ -216,7 +229,7 @@
     private void removeRelationData(Long borrowId) {
         QueryWrapper<BizEquipmentBorrowAttachment> wrapper = new QueryWrapper<>();
         wrapper.eq("borrow_id", borrowId);
-        if(attachmentService.remove(wrapper)){
+        if (attachmentService.remove(wrapper)) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -227,7 +240,7 @@
         attachmentList.forEach(attachment -> {
             attachment.setBorrowId(request.getId());
         });
-        if(attachmentService.saveBatch(request.getAttachmentList())){
+        if (attachmentService.saveBatch(request.getAttachmentList())) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
index 9e4cc6a..40a0f69 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
@@ -72,7 +72,6 @@
     @Override
     public void exportFile(ExportDTO exportDTO, HttpServletResponse response) {
         BizEquipmentExceptionHandle exceptionHandle = this.baseMapper.selectByDetailById(exportDTO.getId());
-
         Map<String, Object> map = BeanUtil.beanToMap(exceptionHandle);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EXCEPTION_HANDLING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,  null, map, exportDTO.isPdf(), response);
     }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f4dc14f..a5f9ad1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -98,7 +98,7 @@
     /**
      * 表单生成及打印
      */
-    TEMPLATE_FILE_NULL(2700, "模板文件不能为空"),
+    MODULE_CONFIG_PRINT(2700, "模板文件配置为空"),
     FOREIGN_KEY_FIELD_NULL(2701, "模块外键字段为空"),
     FOREIGN_KEY_VALUE_NULL(2702, "模块外键值为空"),
     BIND_KEY_LIST_NULL(2703, "绑定管理的列表为空"),
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
index 054e3f0..f2551fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
@@ -62,7 +62,7 @@
         if (StringUtils.isEmpty(beDownloadedFileName)) {
             return;
         }
-        if (CollectionUtil.isEmpty(electronicImageList)) {
+        if (CollectionUtil.isEmpty(beDownloadedFileNames)) {
             beDownloadedFileNames = new ArrayList<>();
         }
         beDownloadedFileNames.add(beDownloadedFileName);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
index ea2772a..699a18c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
@@ -78,7 +78,7 @@
         //主附件信息
         List<BizEquipmentBorrowAttachment> attachmentList = request.getAttachmentList();
         attachmentList.forEach(equip -> equip.setBorrowId(request.getId()));
-        if(!attachmentService.saveBatch(attachmentList)){
+        if (!attachmentService.saveBatch(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
         }
         BorrowSaveResponse saveResponse = new BorrowSaveResponse();
@@ -120,7 +120,14 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentBorrowAttachment : borrowInfo.getAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName() + "," + bizEquipmentBorrowAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
@@ -131,22 +138,28 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getReturnAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentLendAttachment : borrowInfo.getReturnAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName() + "," + bizEquipmentLendAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
                 }
                 map.put("returnCatalogueNameStr", catalogueNameStr);
             }
-            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,null, map, exportDTO.isPdf(), response);
+            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
         }
-
     }
 
     @Override
     public ReturnDTO saveBorrowReturn(BizEquipmentBorrowReturnRequest request) {
         BizEquipmentBorrow borrowInfo = ConvertUtils.sourceToTarget(request, BizEquipmentBorrow.class);
-        if(this.baseMapper.updateById(borrowInfo) <= 0){
+        if (this.baseMapper.updateById(borrowInfo) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         //更新主附件信息
@@ -158,7 +171,7 @@
             attachment.setReturnFlag(1);
             attachmentList.add(attachment);
         });
-        if(!attachmentService.updateBatchById(attachmentList)){
+        if (!attachmentService.updateBatchById(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success();
@@ -216,7 +229,7 @@
     private void removeRelationData(Long borrowId) {
         QueryWrapper<BizEquipmentBorrowAttachment> wrapper = new QueryWrapper<>();
         wrapper.eq("borrow_id", borrowId);
-        if(attachmentService.remove(wrapper)){
+        if (attachmentService.remove(wrapper)) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -227,7 +240,7 @@
         attachmentList.forEach(attachment -> {
             attachment.setBorrowId(request.getId());
         });
-        if(attachmentService.saveBatch(request.getAttachmentList())){
+        if (attachmentService.saveBatch(request.getAttachmentList())) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
index 9e4cc6a..40a0f69 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
@@ -72,7 +72,6 @@
     @Override
     public void exportFile(ExportDTO exportDTO, HttpServletResponse response) {
         BizEquipmentExceptionHandle exceptionHandle = this.baseMapper.selectByDetailById(exportDTO.getId());
-
         Map<String, Object> map = BeanUtil.beanToMap(exceptionHandle);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EXCEPTION_HANDLING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,  null, map, exportDTO.isPdf(), response);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
index 31d668f..f83e293 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
@@ -42,6 +42,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -181,6 +182,7 @@
         QueryWrapper<BizEquipmentTransportPackingThing> wrapper = new QueryWrapper<>();
         wrapper.eq("packing_id", exportDTO.getId());
         List<BizEquipmentTransportPackingThing> thingList = thingService.list(wrapper);
+
         //组装前端所需格式
         Map<String, List<BizEquipmentTransportPackingThing>> collect = thingList.stream().collect(Collectors.groupingBy(BizEquipmentTransportPackingThing::getPackageNo));
         List<TransportPackingThingDetailDTO> packingThingList = new ArrayList<>();
@@ -199,7 +201,8 @@
         List<BizResourceStaffInfo> bizResourceStaffInfoList = bizResourceStaffInfoMapper.selectList(null);
         Map<String, String> bizResourceStaffMap = bizResourceStaffInfoList
                 .stream()
-                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor));
+                .filter(e->StringUtils.isNotEmpty(e.getMajor())&&StringUtils.isNotEmpty(e.getStaffName()))
+                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor,(e1,e2)->e1));
         //处理文档对应的包装箱编号
         for (TransportPackingThingDetailDTO packingThingDetailDTO : packingThingList) {
             for (BizEquipmentTransportPackingThing bizEquipmentTransport : packingThingDetailDTO.getEquipmentList()) {
@@ -213,6 +216,7 @@
                         .build());
             }
         }
+        transportPacking.setPackingTime(transportPacking.getPackingTime().substring(0,10));
         Map<String, Object> map = BeanUtil.beanToMap(transportPacking);
         map.put("detailThingList", detailThingList);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_PACKING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f4dc14f..a5f9ad1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -98,7 +98,7 @@
     /**
      * 表单生成及打印
      */
-    TEMPLATE_FILE_NULL(2700, "模板文件不能为空"),
+    MODULE_CONFIG_PRINT(2700, "模板文件配置为空"),
     FOREIGN_KEY_FIELD_NULL(2701, "模块外键字段为空"),
     FOREIGN_KEY_VALUE_NULL(2702, "模块外键值为空"),
     BIND_KEY_LIST_NULL(2703, "绑定管理的列表为空"),
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
index 054e3f0..f2551fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
@@ -62,7 +62,7 @@
         if (StringUtils.isEmpty(beDownloadedFileName)) {
             return;
         }
-        if (CollectionUtil.isEmpty(electronicImageList)) {
+        if (CollectionUtil.isEmpty(beDownloadedFileNames)) {
             beDownloadedFileNames = new ArrayList<>();
         }
         beDownloadedFileNames.add(beDownloadedFileName);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
index ea2772a..699a18c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
@@ -78,7 +78,7 @@
         //主附件信息
         List<BizEquipmentBorrowAttachment> attachmentList = request.getAttachmentList();
         attachmentList.forEach(equip -> equip.setBorrowId(request.getId()));
-        if(!attachmentService.saveBatch(attachmentList)){
+        if (!attachmentService.saveBatch(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
         }
         BorrowSaveResponse saveResponse = new BorrowSaveResponse();
@@ -120,7 +120,14 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentBorrowAttachment : borrowInfo.getAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName() + "," + bizEquipmentBorrowAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
@@ -131,22 +138,28 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getReturnAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentLendAttachment : borrowInfo.getReturnAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName() + "," + bizEquipmentLendAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
                 }
                 map.put("returnCatalogueNameStr", catalogueNameStr);
             }
-            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,null, map, exportDTO.isPdf(), response);
+            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
         }
-
     }
 
     @Override
     public ReturnDTO saveBorrowReturn(BizEquipmentBorrowReturnRequest request) {
         BizEquipmentBorrow borrowInfo = ConvertUtils.sourceToTarget(request, BizEquipmentBorrow.class);
-        if(this.baseMapper.updateById(borrowInfo) <= 0){
+        if (this.baseMapper.updateById(borrowInfo) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         //更新主附件信息
@@ -158,7 +171,7 @@
             attachment.setReturnFlag(1);
             attachmentList.add(attachment);
         });
-        if(!attachmentService.updateBatchById(attachmentList)){
+        if (!attachmentService.updateBatchById(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success();
@@ -216,7 +229,7 @@
     private void removeRelationData(Long borrowId) {
         QueryWrapper<BizEquipmentBorrowAttachment> wrapper = new QueryWrapper<>();
         wrapper.eq("borrow_id", borrowId);
-        if(attachmentService.remove(wrapper)){
+        if (attachmentService.remove(wrapper)) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -227,7 +240,7 @@
         attachmentList.forEach(attachment -> {
             attachment.setBorrowId(request.getId());
         });
-        if(attachmentService.saveBatch(request.getAttachmentList())){
+        if (attachmentService.saveBatch(request.getAttachmentList())) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
index 9e4cc6a..40a0f69 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
@@ -72,7 +72,6 @@
     @Override
     public void exportFile(ExportDTO exportDTO, HttpServletResponse response) {
         BizEquipmentExceptionHandle exceptionHandle = this.baseMapper.selectByDetailById(exportDTO.getId());
-
         Map<String, Object> map = BeanUtil.beanToMap(exceptionHandle);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EXCEPTION_HANDLING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,  null, map, exportDTO.isPdf(), response);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
index 31d668f..f83e293 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
@@ -42,6 +42,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -181,6 +182,7 @@
         QueryWrapper<BizEquipmentTransportPackingThing> wrapper = new QueryWrapper<>();
         wrapper.eq("packing_id", exportDTO.getId());
         List<BizEquipmentTransportPackingThing> thingList = thingService.list(wrapper);
+
         //组装前端所需格式
         Map<String, List<BizEquipmentTransportPackingThing>> collect = thingList.stream().collect(Collectors.groupingBy(BizEquipmentTransportPackingThing::getPackageNo));
         List<TransportPackingThingDetailDTO> packingThingList = new ArrayList<>();
@@ -199,7 +201,8 @@
         List<BizResourceStaffInfo> bizResourceStaffInfoList = bizResourceStaffInfoMapper.selectList(null);
         Map<String, String> bizResourceStaffMap = bizResourceStaffInfoList
                 .stream()
-                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor));
+                .filter(e->StringUtils.isNotEmpty(e.getMajor())&&StringUtils.isNotEmpty(e.getStaffName()))
+                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor,(e1,e2)->e1));
         //处理文档对应的包装箱编号
         for (TransportPackingThingDetailDTO packingThingDetailDTO : packingThingList) {
             for (BizEquipmentTransportPackingThing bizEquipmentTransport : packingThingDetailDTO.getEquipmentList()) {
@@ -213,6 +216,7 @@
                         .build());
             }
         }
+        transportPacking.setPackingTime(transportPacking.getPackingTime().substring(0,10));
         Map<String, Object> map = BeanUtil.beanToMap(transportPacking);
         map.put("detailThingList", detailThingList);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_PACKING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
index b2dd4b1..752a06d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
@@ -195,7 +195,7 @@
                     electronicImage.setElectronicSealImageUrl(filePrintRegister.getTemDir() + signFileName);
                     electronicImage.setImageConfig(approvalImageList.get(i));
                     //放入待下载的文件集合
-                    filePrintRegister.getBeDownloadedFileNames().add(signFileName);
+                    filePrintRegister.setBeDownloadedFileNames(signFileName);
                     electronicImageList.add(electronicImage);
                 }
             }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f4dc14f..a5f9ad1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -98,7 +98,7 @@
     /**
      * 表单生成及打印
      */
-    TEMPLATE_FILE_NULL(2700, "模板文件不能为空"),
+    MODULE_CONFIG_PRINT(2700, "模板文件配置为空"),
     FOREIGN_KEY_FIELD_NULL(2701, "模块外键字段为空"),
     FOREIGN_KEY_VALUE_NULL(2702, "模块外键值为空"),
     BIND_KEY_LIST_NULL(2703, "绑定管理的列表为空"),
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
index 054e3f0..f2551fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
@@ -62,7 +62,7 @@
         if (StringUtils.isEmpty(beDownloadedFileName)) {
             return;
         }
-        if (CollectionUtil.isEmpty(electronicImageList)) {
+        if (CollectionUtil.isEmpty(beDownloadedFileNames)) {
             beDownloadedFileNames = new ArrayList<>();
         }
         beDownloadedFileNames.add(beDownloadedFileName);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
index ea2772a..699a18c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
@@ -78,7 +78,7 @@
         //主附件信息
         List<BizEquipmentBorrowAttachment> attachmentList = request.getAttachmentList();
         attachmentList.forEach(equip -> equip.setBorrowId(request.getId()));
-        if(!attachmentService.saveBatch(attachmentList)){
+        if (!attachmentService.saveBatch(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
         }
         BorrowSaveResponse saveResponse = new BorrowSaveResponse();
@@ -120,7 +120,14 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentBorrowAttachment : borrowInfo.getAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName() + "," + bizEquipmentBorrowAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
@@ -131,22 +138,28 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getReturnAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentLendAttachment : borrowInfo.getReturnAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName() + "," + bizEquipmentLendAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
                 }
                 map.put("returnCatalogueNameStr", catalogueNameStr);
             }
-            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,null, map, exportDTO.isPdf(), response);
+            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
         }
-
     }
 
     @Override
     public ReturnDTO saveBorrowReturn(BizEquipmentBorrowReturnRequest request) {
         BizEquipmentBorrow borrowInfo = ConvertUtils.sourceToTarget(request, BizEquipmentBorrow.class);
-        if(this.baseMapper.updateById(borrowInfo) <= 0){
+        if (this.baseMapper.updateById(borrowInfo) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         //更新主附件信息
@@ -158,7 +171,7 @@
             attachment.setReturnFlag(1);
             attachmentList.add(attachment);
         });
-        if(!attachmentService.updateBatchById(attachmentList)){
+        if (!attachmentService.updateBatchById(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success();
@@ -216,7 +229,7 @@
     private void removeRelationData(Long borrowId) {
         QueryWrapper<BizEquipmentBorrowAttachment> wrapper = new QueryWrapper<>();
         wrapper.eq("borrow_id", borrowId);
-        if(attachmentService.remove(wrapper)){
+        if (attachmentService.remove(wrapper)) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -227,7 +240,7 @@
         attachmentList.forEach(attachment -> {
             attachment.setBorrowId(request.getId());
         });
-        if(attachmentService.saveBatch(request.getAttachmentList())){
+        if (attachmentService.saveBatch(request.getAttachmentList())) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
index 9e4cc6a..40a0f69 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
@@ -72,7 +72,6 @@
     @Override
     public void exportFile(ExportDTO exportDTO, HttpServletResponse response) {
         BizEquipmentExceptionHandle exceptionHandle = this.baseMapper.selectByDetailById(exportDTO.getId());
-
         Map<String, Object> map = BeanUtil.beanToMap(exceptionHandle);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EXCEPTION_HANDLING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,  null, map, exportDTO.isPdf(), response);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
index 31d668f..f83e293 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
@@ -42,6 +42,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -181,6 +182,7 @@
         QueryWrapper<BizEquipmentTransportPackingThing> wrapper = new QueryWrapper<>();
         wrapper.eq("packing_id", exportDTO.getId());
         List<BizEquipmentTransportPackingThing> thingList = thingService.list(wrapper);
+
         //组装前端所需格式
         Map<String, List<BizEquipmentTransportPackingThing>> collect = thingList.stream().collect(Collectors.groupingBy(BizEquipmentTransportPackingThing::getPackageNo));
         List<TransportPackingThingDetailDTO> packingThingList = new ArrayList<>();
@@ -199,7 +201,8 @@
         List<BizResourceStaffInfo> bizResourceStaffInfoList = bizResourceStaffInfoMapper.selectList(null);
         Map<String, String> bizResourceStaffMap = bizResourceStaffInfoList
                 .stream()
-                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor));
+                .filter(e->StringUtils.isNotEmpty(e.getMajor())&&StringUtils.isNotEmpty(e.getStaffName()))
+                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor,(e1,e2)->e1));
         //处理文档对应的包装箱编号
         for (TransportPackingThingDetailDTO packingThingDetailDTO : packingThingList) {
             for (BizEquipmentTransportPackingThing bizEquipmentTransport : packingThingDetailDTO.getEquipmentList()) {
@@ -213,6 +216,7 @@
                         .build());
             }
         }
+        transportPacking.setPackingTime(transportPacking.getPackingTime().substring(0,10));
         Map<String, Object> map = BeanUtil.beanToMap(transportPacking);
         map.put("detailThingList", detailThingList);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_PACKING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
index b2dd4b1..752a06d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
@@ -195,7 +195,7 @@
                     electronicImage.setElectronicSealImageUrl(filePrintRegister.getTemDir() + signFileName);
                     electronicImage.setImageConfig(approvalImageList.get(i));
                     //放入待下载的文件集合
-                    filePrintRegister.getBeDownloadedFileNames().add(signFileName);
+                    filePrintRegister.setBeDownloadedFileNames(signFileName);
                     electronicImageList.add(electronicImage);
                 }
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
index 52eda1b..795eaf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
@@ -32,6 +32,10 @@
     public FilePrintRegister printFileRegister(String moduleName, String moduleType, Map<String, Object> customParam, Long moduleIdValue, String templateFileDir) {
         //获取当前模板配置信息
         ModuleTemplatePrintConfig moduleTemplatePrintConfig = getModuleTemplatePrintConfig(moduleName, moduleType);
+        Assert.isFalse(ObjectUtils.isEmpty(moduleTemplatePrintConfig),
+                () -> {
+                    throw new BusinessException(BusinessExceptionEnum.MODULE_CONFIG_PRINT);
+                });
         moduleIdValue = ObjectUtils.isEmpty(moduleIdValue) ? (Long) customParam.get("id") : moduleIdValue;
         //根据打印模板配置，初始化文件打印注册信息
         FilePrintRegister filePrintRegister = initialization(templateFileDir, moduleIdValue, moduleTemplatePrintConfig);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index f4dc14f..a5f9ad1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -98,7 +98,7 @@
     /**
      * 表单生成及打印
      */
-    TEMPLATE_FILE_NULL(2700, "模板文件不能为空"),
+    MODULE_CONFIG_PRINT(2700, "模板文件配置为空"),
     FOREIGN_KEY_FIELD_NULL(2701, "模块外键字段为空"),
     FOREIGN_KEY_VALUE_NULL(2702, "模块外键值为空"),
     BIND_KEY_LIST_NULL(2703, "绑定管理的列表为空"),
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
index 054e3f0..f2551fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
@@ -62,7 +62,7 @@
         if (StringUtils.isEmpty(beDownloadedFileName)) {
             return;
         }
-        if (CollectionUtil.isEmpty(electronicImageList)) {
+        if (CollectionUtil.isEmpty(beDownloadedFileNames)) {
             beDownloadedFileNames = new ArrayList<>();
         }
         beDownloadedFileNames.add(beDownloadedFileName);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
index ea2772a..699a18c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentBorrowServiceImpl.java
@@ -78,7 +78,7 @@
         //主附件信息
         List<BizEquipmentBorrowAttachment> attachmentList = request.getAttachmentList();
         attachmentList.forEach(equip -> equip.setBorrowId(request.getId()));
-        if(!attachmentService.saveBatch(attachmentList)){
+        if (!attachmentService.saveBatch(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
         }
         BorrowSaveResponse saveResponse = new BorrowSaveResponse();
@@ -120,7 +120,14 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentBorrowAttachment : borrowInfo.getAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName() + "," + bizEquipmentBorrowAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentBorrowAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentBorrowAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
@@ -131,22 +138,28 @@
             if (CollectionUtils.isNotEmpty(borrowInfo.getReturnAttachmentList())) {
                 String catalogueNameStr = "";
                 for (BizEquipmentBorrowAttachment bizEquipmentLendAttachment : borrowInfo.getReturnAttachmentList()) {
-                    catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName() + "," + bizEquipmentLendAttachment.getReturnFlag() + ";";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getName())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getName();
+                    }
+                    catalogueNameStr += ",";
+                    if (StringUtils.isNotEmpty(bizEquipmentLendAttachment.getInformation())) {
+                        catalogueNameStr = catalogueNameStr + bizEquipmentLendAttachment.getInformation();
+                    }
+                    catalogueNameStr += ";";
                 }
                 if (StringUtils.isNotEmpty(catalogueNameStr)) {
                     catalogueNameStr = catalogueNameStr.substring(0, catalogueNameStr.length() - 1);
                 }
                 map.put("returnCatalogueNameStr", catalogueNameStr);
             }
-            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,null, map, exportDTO.isPdf(), response);
+            printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_BORROWING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
         }
-
     }
 
     @Override
     public ReturnDTO saveBorrowReturn(BizEquipmentBorrowReturnRequest request) {
         BizEquipmentBorrow borrowInfo = ConvertUtils.sourceToTarget(request, BizEquipmentBorrow.class);
-        if(this.baseMapper.updateById(borrowInfo) <= 0){
+        if (this.baseMapper.updateById(borrowInfo) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         //更新主附件信息
@@ -158,7 +171,7 @@
             attachment.setReturnFlag(1);
             attachmentList.add(attachment);
         });
-        if(!attachmentService.updateBatchById(attachmentList)){
+        if (!attachmentService.updateBatchById(attachmentList)) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success();
@@ -216,7 +229,7 @@
     private void removeRelationData(Long borrowId) {
         QueryWrapper<BizEquipmentBorrowAttachment> wrapper = new QueryWrapper<>();
         wrapper.eq("borrow_id", borrowId);
-        if(attachmentService.remove(wrapper)){
+        if (attachmentService.remove(wrapper)) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -227,7 +240,7 @@
         attachmentList.forEach(attachment -> {
             attachment.setBorrowId(request.getId());
         });
-        if(attachmentService.saveBatch(request.getAttachmentList())){
+        if (attachmentService.saveBatch(request.getAttachmentList())) {
             return;
         }
         throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
index 9e4cc6a..40a0f69 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentExceptionHandleServiceImpl.java
@@ -72,7 +72,6 @@
     @Override
     public void exportFile(ExportDTO exportDTO, HttpServletResponse response) {
         BizEquipmentExceptionHandle exceptionHandle = this.baseMapper.selectByDetailById(exportDTO.getId());
-
         Map<String, Object> map = BeanUtil.beanToMap(exceptionHandle);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EXCEPTION_HANDLING, PrintFileModuleNameEnum.EXPORT_TEMPLATE,  null, map, exportDTO.isPdf(), response);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
index 31d668f..f83e293 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentTransportPackingServiceImpl.java
@@ -42,6 +42,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -181,6 +182,7 @@
         QueryWrapper<BizEquipmentTransportPackingThing> wrapper = new QueryWrapper<>();
         wrapper.eq("packing_id", exportDTO.getId());
         List<BizEquipmentTransportPackingThing> thingList = thingService.list(wrapper);
+
         //组装前端所需格式
         Map<String, List<BizEquipmentTransportPackingThing>> collect = thingList.stream().collect(Collectors.groupingBy(BizEquipmentTransportPackingThing::getPackageNo));
         List<TransportPackingThingDetailDTO> packingThingList = new ArrayList<>();
@@ -199,7 +201,8 @@
         List<BizResourceStaffInfo> bizResourceStaffInfoList = bizResourceStaffInfoMapper.selectList(null);
         Map<String, String> bizResourceStaffMap = bizResourceStaffInfoList
                 .stream()
-                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor));
+                .filter(e->StringUtils.isNotEmpty(e.getMajor())&&StringUtils.isNotEmpty(e.getStaffName()))
+                .collect(Collectors.toMap(BizResourceStaffInfo::getStaffName, BizResourceStaffInfo::getMajor,(e1,e2)->e1));
         //处理文档对应的包装箱编号
         for (TransportPackingThingDetailDTO packingThingDetailDTO : packingThingList) {
             for (BizEquipmentTransportPackingThing bizEquipmentTransport : packingThingDetailDTO.getEquipmentList()) {
@@ -213,6 +216,7 @@
                         .build());
             }
         }
+        transportPacking.setPackingTime(transportPacking.getPackingTime().substring(0,10));
         Map<String, Object> map = BeanUtil.beanToMap(transportPacking);
         map.put("detailThingList", detailThingList);
         printFileRegister.registerPrintFile(PrintFileModuleNameEnum.EQUIPMENT_PACKING, PrintFileModuleNameEnum.EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
index b2dd4b1..752a06d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
@@ -195,7 +195,7 @@
                     electronicImage.setElectronicSealImageUrl(filePrintRegister.getTemDir() + signFileName);
                     electronicImage.setImageConfig(approvalImageList.get(i));
                     //放入待下载的文件集合
-                    filePrintRegister.getBeDownloadedFileNames().add(signFileName);
+                    filePrintRegister.setBeDownloadedFileNames(signFileName);
                     electronicImageList.add(electronicImage);
                 }
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
index 52eda1b..795eaf0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
@@ -32,6 +32,10 @@
     public FilePrintRegister printFileRegister(String moduleName, String moduleType, Map<String, Object> customParam, Long moduleIdValue, String templateFileDir) {
         //获取当前模板配置信息
         ModuleTemplatePrintConfig moduleTemplatePrintConfig = getModuleTemplatePrintConfig(moduleName, moduleType);
+        Assert.isFalse(ObjectUtils.isEmpty(moduleTemplatePrintConfig),
+                () -> {
+                    throw new BusinessException(BusinessExceptionEnum.MODULE_CONFIG_PRINT);
+                });
         moduleIdValue = ObjectUtils.isEmpty(moduleIdValue) ? (Long) customParam.get("id") : moduleIdValue;
         //根据打印模板配置，初始化文件打印注册信息
         FilePrintRegister filePrintRegister = initialization(templateFileDir, moduleIdValue, moduleTemplatePrintConfig);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java
index 0f4099c..656fa51 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java
@@ -10,6 +10,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import liquibase.pro.packaged.A;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.xwpf.usermodel.*;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
 import org.slf4j.Logger;
@@ -17,6 +18,7 @@
 
 import java.math.BigInteger;
 import java.util.*;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
@@ -194,10 +196,12 @@
     private void mergeCell(XWPFTable table, List<String> mergeColNames) {
         //表头检测
         if (CollectionUtil.isNotEmpty(mergeColNames)) {
-            //遍寻列，同时增加下标超值判断\
-            List<Integer> mergeIndexList = checkThisTableCellMergeIndex(table, mergeColNames);
+            //遍寻列，同时增加下标超值判断
+            int positionIndex = tryGetInitialMergeRow(table);
+            List<Integer> mergeIndexList = checkThisTableCellMergeIndex(positionIndex, table, mergeColNames);
+
+            Map<Integer, Integer> mergeIndexMap = mergeIndexList.stream().collect(Collectors.toMap(e -> e, e -> e));
             //直到查询的上下列不一样的时候，停止遍历列的循环，停止遍历
-            int positionIndex = 1;
             while (positionIndex < table.getNumberOfRows()) {
                 XWPFTableRow row = table.getRow(positionIndex);
                 if (row == null) {
@@ -205,6 +209,9 @@
                 }
                 int startIndex = positionIndex, maxEndIndex = positionIndex;
                 for (int i = 0; i < row.getTableCells().size(); i++) {
+                    if (!mergeIndexMap.containsKey(i)) {
+                        continue;
+                    }
                     int endIndex = positionIndex;
                     int rowIndex = positionIndex + 1;
                     while ((maxEndIndex > positionIndex && rowIndex <= maxEndIndex) ||
@@ -226,19 +233,58 @@
         }
     }
 
-    private List<Integer> checkThisTableCellMergeIndex(XWPFTable table, List<String> mergeColNames) {
+    private Integer tryGetInitialMergeRow(XWPFTable table) {
+        int positionIndex = 1, initialMergeRow = 0;
+        while (positionIndex < table.getNumberOfRows()) {
+            if (StringUtils.isEmpty(table.getRow(positionIndex).getTableCells().get(0).getText())) {
+                initialMergeRow = ++positionIndex;
+            } else {
+                return initialMergeRow;
+            }
+        }
+        return initialMergeRow;
+    }
+
+    private List<Integer> checkThisTableCellMergeIndex(int positionIndex, XWPFTable table, List<String> mergeColNames) {
         Map<String, String> mergeColNameMap = mergeColNames.stream().collect(
                 Collectors.toMap(e -> e, e -> e)
         );
         int colIndex = 0;
         List<Integer> mergeIndexList = new ArrayList<>();
-        XWPFTableRow row = table.getRow(0);
-        while (colIndex < row.getTableCells().size()) {
-            String titleText = row.getTableCells().get(colIndex).getText();
-            if (StringUtils.isNotEmpty(titleText)) {
-                if (mergeColNameMap.containsKey(titleText)) {
-                    mergeIndexList.add(colIndex);
+        for (int i = 0; i < --positionIndex; i++) {
+            XWPFTableRow row = table.getRow(i);
+            //标题合并行
+            while (colIndex < row.getTableCells().size()) {
+                String titleText = row.getTableCells().get(colIndex).getText();
+                if (StringUtils.isNotEmpty(titleText)) {
+                    if (mergeColNameMap.containsKey(titleText)) {
+                        //合并两行的存在
+                        if (i < positionIndex) {
+                            Integer mergerIndex = 0;
+                            List<XWPFTableCell> cells = table.getRow(positionIndex).getTableCells();
+                            for (int j = 0; j < cells.size(); ) {
+                                //获取当前所在行为空，
+                                if (StringUtils.isNotEmpty(cells.get(j).getText())) {
+                                    if (++mergerIndex > colIndex) {
+                                        mergeIndexList.add(j - 1);
+                                        break;
+                                    }
+                                    while (StringUtils.isNotEmpty(cells.get(++j).getText())) {
+                                    }
+                                } else {
+                                    j++;
+                                    if (++mergerIndex > colIndex) {
+                                        mergeIndexList.add(j - 1);
+                                        break;
+                                    }
+                                }
+                            }
+                        } else {
+                            mergeIndexList.add(colIndex);
+                        }
+                    }
                 }
+                colIndex++;
             }
         }
         return mergeIndexList;