diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index def45bb..e57b8f4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -27,17 +27,14 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
-import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
 import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper;
 import com.casic.missiles.model.equipment.*;
-import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
 import com.casic.missiles.modular.system.model.Dept;
 import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
-import com.casic.missiles.service.meter.IMeterOrganizeService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -360,8 +357,12 @@
         Map<Long, String> meterOrganizeMap = deptList.stream()
                 .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
         for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
-            equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
-            equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept())));
+            if(Objects.nonNull(equipmentFixedAssets.getUseDept())){
+                equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
+            }
+            if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){
+                equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept())));
+            }
         }
         return equipmentFixedAssetsList;
     }