|
|
@@ -79,11 +79,17 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
|
|
|
var adminStationIds = KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong());
|
|
|
QueryWrapper<Station> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("station_status", Station.STATION_STATUS_正常使用);
|
|
|
+
|
|
|
+
|
|
|
if (CommUtil.isNotEmptyAndNull(params.getStationId())) {
|
|
|
Set<String> stationIdSets = new java.util.HashSet<>(Set.of(params.getStationId()));
|
|
|
stationIdSets.addAll(adminStationIds);
|
|
|
queryWrapper.in("station_id", stationIdSets);
|
|
|
}
|
|
|
+ if (CommUtil.isNotEmptyAndNull(params.getStationIdList())) {
|
|
|
+ queryWrapper.in("station_id", params.getStationIdList());
|
|
|
+ }
|
|
|
+
|
|
|
if (CommUtil.isNotEmptyAndNull(adminStationIds)) {
|
|
|
queryWrapper.in("station_id", adminStationIds);
|
|
|
}
|
|
|
@@ -192,6 +198,7 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
|
|
|
LambdaQueryWrapper<Station> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.select(Station::getStationId, Station::getStationName, Station::getAddress, Station::getLocation,
|
|
|
Station::getStationStatus, Station::getParkingNum, Station::getElectricityFee, Station::getServiceFee, Station::getParkFee);
|
|
|
+ queryWrapper.in(CommUtil.isNotEmptyAndNull(params.getStationIdList()),Station::getStationId,params.getStationIdList());
|
|
|
var stationVoList = new ArrayList<SimpleStationVo>();
|
|
|
var stationList = list(queryWrapper);
|
|
|
for (var station : stationList) {
|