diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml index c163d55a0..bd4efc407 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml @@ -478,7 +478,7 @@ pile_station_info t1 JOIN pile_merchant_info t2 ON t1.merchant_id = t2.id AND t1.del_flag = '0' - and public_flag = '1' + and t1.public_flag = '1' and t1.address like concat('%', #{dto.address}, '%') diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/hainan/service/HaiNanPlatformLogic.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/hainan/service/HaiNanPlatformLogic.java index 605c77313..565154848 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/hainan/service/HaiNanPlatformLogic.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/hainan/service/HaiNanPlatformLogic.java @@ -135,6 +135,8 @@ public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { // 站点图片 if (StringUtils.isNotBlank(pileStationInfo.getPictures())) { stationInfo.setPictures(Lists.newArrayList(pileStationInfo.getPictures().split(","))); + } else { + stationInfo.setPictures(Lists.newArrayList()); } List pileList = getPileList(pileStationInfo);