diff --git a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeRegionMapper.java b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeRegionMapper.java index 885b746..16e3c2a 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeRegionMapper.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeRegionMapper.java @@ -29,7 +29,7 @@ public interface EbikeRegionMapper extends BaseMapper { * @param point 用户当前位置 * @return 列表 */ - List findAllRegionsOrderByDistance(Point point); + List findAllRegionsOrderByDistance(Point point,Long operatorId); /** * 根据当前位置查询当前运营区及站点 diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java index 86d50ec..fcd0f32 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java @@ -759,7 +759,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl regionList(OrderRegionVo orderRegionVo) { Point point = orderRegionVo.getPoint(); if (point != null) { - return regionMapper.findAllRegionsOrderByDistance(point); + return regionMapper.findAllRegionsOrderByDistance(point,StpUtil.getLoginIdAsLong()); } else { return regionMapper.selectAll(); } diff --git a/ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml b/ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml index d6a2121..12b899c 100644 --- a/ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml +++ b/ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml @@ -27,6 +27,7 @@ ebike_region WHERE is_deleted IS NOT TRUE + AND operator_id = #{operatorId} ORDER BY is_within_region DESC, distance_meters