|
|
|
@ -747,14 +747,11 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
|
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
|
public List<StationEntity> select(Integer type, Integer serveType) { |
|
|
|
|
List<Integer> types; |
|
|
|
|
List<Integer> types= HomePageConstant.SERVETYPE_LIST; |
|
|
|
|
if (ObjectUtil.isEmpty(type)) { |
|
|
|
|
types = HomePageConstant.SERVETYPE_LIST; |
|
|
|
|
} else if (HomePageConstant.WATER_CONSERVANCY.equals(type)) { |
|
|
|
|
types = HomePageConstant.waterList; |
|
|
|
|
} else { |
|
|
|
|
types = Collections.singletonList(type); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<Integer> serveTypes; |
|
|
|
|
if (ObjectUtil.isEmpty(serveType)) { |
|
|
|
|
serveTypes = Arrays.asList(HomePageConstant.HYDROPOWER_SERVETYPE, HomePageConstant.CLOUD_SERVETYPE); |
|
|
|
|