diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
index 01166a2..c786a45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
@@ -55,6 +55,11 @@
             if (ObjectUtils.isEmpty(request)) {
                 return null;
             }
+            if (CollectionUtil.isEmpty(request.getCheckEquipmentList())) {
+                List<BizEquipmentInfo> bizEquipmentInfoList = new ArrayList<>();
+                bizEquipmentInfoList.add(new BizEquipmentInfo());
+                request.setCheckEquipmentList(bizEquipmentInfoList);
+            }
             Map<String, Object> map = BeanUtil.beanToMap(request);
             //划分为最佳点，最差点，典型点
             String[] pointStr = {BEST_POINT, WORST_POINT, MODEL_POINT};

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
index 01166a2..c786a45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
@@ -55,6 +55,11 @@
             if (ObjectUtils.isEmpty(request)) {
                 return null;
             }
+            if (CollectionUtil.isEmpty(request.getCheckEquipmentList())) {
+                List<BizEquipmentInfo> bizEquipmentInfoList = new ArrayList<>();
+                bizEquipmentInfoList.add(new BizEquipmentInfo());
+                request.setCheckEquipmentList(bizEquipmentInfoList);
+            }
             Map<String, Object> map = BeanUtil.beanToMap(request);
             //划分为最佳点，最差点，典型点
             String[] pointStr = {BEST_POINT, WORST_POINT, MODEL_POINT};
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index e752533..2d4636a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -113,6 +113,7 @@
     }
 
     @Override
+    @Transactional
     public EquipmentImportDuplicationResult<EquipmentInfoImportDTO> infoImport(MultipartFile file) throws IOException {
         InputStream inputStream = file.getInputStream();
         //保证登录账号、部门id正确
@@ -127,7 +128,7 @@
         //与数据库中设备比对去重
         EquipmentImportDuplicationResult<EquipmentInfoImportDTO> checkResult = checkImportDuplication(list);
         if (CollUtil.isNotEmpty(checkResult.getUnDuplicationResult())) {
-            saveImport(list);
+            saveImport(checkResult.getUnDuplicationResult());
         }
         return checkResult;
     }

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
index 01166a2..c786a45 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
@@ -55,6 +55,11 @@
             if (ObjectUtils.isEmpty(request)) {
                 return null;
             }
+            if (CollectionUtil.isEmpty(request.getCheckEquipmentList())) {
+                List<BizEquipmentInfo> bizEquipmentInfoList = new ArrayList<>();
+                bizEquipmentInfoList.add(new BizEquipmentInfo());
+                request.setCheckEquipmentList(bizEquipmentInfoList);
+            }
             Map<String, Object> map = BeanUtil.beanToMap(request);
             //划分为最佳点，最差点，典型点
             String[] pointStr = {BEST_POINT, WORST_POINT, MODEL_POINT};
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
index e752533..2d4636a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java
@@ -113,6 +113,7 @@
     }
 
     @Override
+    @Transactional
     public EquipmentImportDuplicationResult<EquipmentInfoImportDTO> infoImport(MultipartFile file) throws IOException {
         InputStream inputStream = file.getInputStream();
         //保证登录账号、部门id正确
@@ -127,7 +128,7 @@
         //与数据库中设备比对去重
         EquipmentImportDuplicationResult<EquipmentInfoImportDTO> checkResult = checkImportDuplication(list);
         if (CollUtil.isNotEmpty(checkResult.getUnDuplicationResult())) {
-            saveImport(list);
+            saveImport(checkResult.getUnDuplicationResult());
         }
         return checkResult;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java
index 1ebba81..8cee431 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java
@@ -247,6 +247,13 @@
         return initialMergeRow;
     }
 
+    /**
+     *
+     * @param positionIndex  位置索引
+     * @param table
+     * @param mergeColNames  合并表头参数
+     * @return
+     */
     private List<Integer> checkThisTableCellMergeIndex(int positionIndex, XWPFTable table, List<String> mergeColNames) {
         Map<String, String> mergeColNameMap = mergeColNames.stream().collect(
                 Collectors.toMap(e -> e, e -> e)