From 08cc2da35a7b556d9b34fd61d3d87d232dbc5e6a534797702d36d9597a07370a Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Tue, 3 Feb 2026 17:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operations/service/impl/EbikeBikeOrderServiceImpl.java   | 5 ++++-
 .../src/main/resources/mapper/EbikeRegionMapper.xml          | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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 fcd0f32..d6ab6a5 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
@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.io.file.FileNameUtil;
 import com.cdzy.common.ex.EbikeException;
 import com.cdzy.common.model.dto.ResGPSDto;
+import com.cdzy.common.model.response.CommonStaffInfo;
 import com.cdzy.operations.enums.*;
 import com.cdzy.operations.mapper.*;
 import com.cdzy.operations.model.dto.*;
@@ -759,7 +760,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     public List<EbikeRegion> regionList(OrderRegionVo orderRegionVo) {
         Point point = orderRegionVo.getPoint();
         if (point != null) {
-            return regionMapper.findAllRegionsOrderByDistance(point,StpUtil.getLoginIdAsLong());
+            String loginId = StpUtil.getLoginIdAsString();
+            CommonStaffInfo staffInfo = (CommonStaffInfo) StpUtil.getSession().get(loginId);
+            return regionMapper.findAllRegionsOrderByDistance(point,staffInfo.getOperatorId());
         } 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 12b899c..6b34100 100644
--- a/ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml
+++ b/ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml
@@ -21,8 +21,8 @@
     <select id="findAllRegionsOrderByDistance" resultType="com.cdzy.operations.model.entity.EbikeRegion">
         SELECT
             ebike_region.*,
-            ST_Distance (  region_polygon::geometry, ST_SetSRID ( ST_MakePoint ( #{lng}, #{lat}), 4326 ) :: geography ) AS distance_meters,
-            ST_Contains ( ST_SetSRID(region_polygon::geometry, 4326), ST_SetSRID ( ST_MakePoint ( #{lng}, #{lat}), 4326 ) ) AS is_within_region
+            ST_Distance (  region_polygon::geometry, ST_SetSRID ( ST_MakePoint ( #{point.x}, #{point.y}), 4326 ) :: geography ) AS distance_meters,
+            ST_Contains ( ST_SetSRID(region_polygon::geometry, 4326), ST_SetSRID ( ST_MakePoint ( #{point.x}, #{point.y}), 4326 ) ) AS is_within_region
         FROM
             ebike_region
         WHERE