diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
index 9940c80..bf34d51 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
@@ -118,7 +118,7 @@
             String fileName = file.getOriginalFilename();
             String[] split = fileName.split("\\.");
             if (split.length > 1) {
-                fileName = split[0] + "_" + System.currentTimeMillis() + "." + split[1];
+                fileName = String.join(".", Arrays.copyOfRange(split, 0, split.length - 1)) + "_" + System.currentTimeMillis() + "." + split[split.length - 1];
             } else {
                 fileName = fileName + System.currentTimeMillis();
             }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
index 9940c80..bf34d51 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
@@ -118,7 +118,7 @@
             String fileName = file.getOriginalFilename();
             String[] split = fileName.split("\\.");
             if (split.length > 1) {
-                fileName = split[0] + "_" + System.currentTimeMillis() + "." + split[1];
+                fileName = String.join(".", Arrays.copyOfRange(split, 0, split.length - 1)) + "_" + System.currentTimeMillis() + "." + split[split.length - 1];
             } else {
                 fileName = fileName + System.currentTimeMillis();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index 4ab20ae..c9ac30f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -525,7 +525,9 @@
                     SystemLocation location = new SystemLocation();
                     location.setInstallLocation(importDTO.getInstallLocation());
                     location.setSubSystemId(importDTO.getDeptId());
-                    location.setPositionId(Long.valueOf(importDTO.getUsePositionId()));
+                    if(ObjectUtil.isNotEmpty(importDTO.getUsePositionId())){
+                        location.setPositionId(Long.valueOf(importDTO.getUsePositionId()));
+                    }
                     Long locationId = locationService.add(location);
                     importDTO.setInstallLocationId(locationId);
                     locationList.add(location);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
index 9940c80..bf34d51 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
@@ -118,7 +118,7 @@
             String fileName = file.getOriginalFilename();
             String[] split = fileName.split("\\.");
             if (split.length > 1) {
-                fileName = split[0] + "_" + System.currentTimeMillis() + "." + split[1];
+                fileName = String.join(".", Arrays.copyOfRange(split, 0, split.length - 1)) + "_" + System.currentTimeMillis() + "." + split[split.length - 1];
             } else {
                 fileName = fileName + System.currentTimeMillis();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index 4ab20ae..c9ac30f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -525,7 +525,9 @@
                     SystemLocation location = new SystemLocation();
                     location.setInstallLocation(importDTO.getInstallLocation());
                     location.setSubSystemId(importDTO.getDeptId());
-                    location.setPositionId(Long.valueOf(importDTO.getUsePositionId()));
+                    if(ObjectUtil.isNotEmpty(importDTO.getUsePositionId())){
+                        location.setPositionId(Long.valueOf(importDTO.getUsePositionId()));
+                    }
                     Long locationId = locationService.add(location);
                     importDTO.setInstallLocationId(locationId);
                     locationList.add(location);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
index c5e7b0a..8206914 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowRelationServiceImpl.java
@@ -30,7 +30,7 @@
 @RequiredArgsConstructor
 public class EquipmentBorrowRelationServiceImpl extends ServiceImpl<EquipmentBorrowRelationMapper, EquipmentBorrowRelation> implements IEquipmentBorrowRelationService {
 
-    private ISystemDeptService systemDeptService;
+    private final ISystemDeptService systemDeptService;
     @Override
     public boolean saveByApproval(Long approvalId, List<EquipmentBorrowRelation> relationList) {
         this.deleteByApproval(approvalId);