fit: bug修复

src/main/java/com/bellmann/manger/impl/DeviceTypeManagerImpl.java

@@ -32,8 +32,12 @@ public class DeviceTypeManagerImpl implements DeviceTypeManager {
     public EquipmentTypeVO findEquipmentType(Long typeAndVerId) {
         EquipmentTypeVO equipmentType = deviceTypeMapper.findEquipmentType(typeAndVerId);
         equipmentType.setOldCASeparation(IBaseEnum.getLabelByValue(equipmentType.getOldCASeparation(), OldCASeparationEnum.class));
-        equipmentType.setDevAccessType(IBaseEnum.getLabelByValue(equipmentType.getDevAccessType(), DevAccessTypeEnum.class));
-        equipmentType.setEquipmentTypeVer(IBaseEnum.getLabelByValue(equipmentType.getEquipmentTypeVer(), EquipmentTypeEnum.class));
+        if (equipmentType.getDevAccessType()!=null) {
+            equipmentType.setDevAccessType(IBaseEnum.getLabelByValue(equipmentType.getDevAccessType(), DevAccessTypeEnum.class));
+        }
+        if (equipmentType.getEquipmentTypeVer()!=null) {
+            equipmentType.setEquipmentTypeVer(IBaseEnum.getLabelByValue(equipmentType.getEquipmentTypeVer(), EquipmentTypeEnum.class));
+        }
         return equipmentType;
     }
 }

src/main/java/com/bellmann/service/impl/FaultServiceImpl.java

@@ -73,7 +73,7 @@ public class FaultServiceImpl implements FaultService {
             DeviceTypeVerDetail deviceTypeVerDetail = deviceTypeVerDetailMapper.selectOne(new LambdaQueryWrapper<DeviceTypeVerDetail>()
                     .eq(DeviceTypeVerDetail::getTypeAndVerId, typeAndVerId)
             );
-            if (deviceTypeVerDetail != null) {
+            if (deviceTypeVerDetail != null&&deviceTypeVerDetail.getDevAccessType()!=null) {
                 faultBasicInfoQuery.setDevAccessType(IBaseEnum.getLabelByValue(deviceTypeVerDetail.getDevAccessType(), DevAccessTypeEnum.class));
             }
         }