Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -3743,7 +3743,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
         Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePage(page, jsonObject);
         result.getRecords().forEach(i -> {
-            i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
+            i.put("chargingMedium", Optional.ofNullable(fillingMediumMap.get(i.get("chargingMedium"))).orElse(""));
             i.put("productPhoto", JSONArray.parseArray(i.getString("productPhoto")));
             i.put("cylinderStampAttachment", JSONArray.parseArray(i.getString("cylinderStampAttachment")));
             i.put("informationSituation",InformationManageTypeEnum.getName(i.getString("informationSituation")));