From c434fc9321801fe88e92b216abdf3a30cb84a98dbaf9bcabad3c415fb1ed45ff Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Wed, 25 Feb 2026 16:19:07 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operations/mapper/EbikeRegionMapper.java   |  2 +-
 .../impl/EbikeBikeOrderServiceImpl.java        | 11 ++++++++++-
 .../resources/mapper/EbikeRegionMapper.xml     | 18 +++++++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)

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 16e3c2a..7247e66 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<EbikeRegion> {
      * @param point 用户当前位置
      * @return 列表
      */
-    List<EbikeRegion> findAllRegionsOrderByDistance(Point point,Long operatorId);
+    List<EbikeRegion> findAllRegionsOrderByDistance(Point point,Long operatorId,Boolean isAdmin);
 
     /**
      * 根据当前位置查询当前运营区及站点
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 cae2286..9a8f749 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.CommonEbikeRole;
 import com.cdzy.common.model.response.CommonStaffInfo;
 import com.cdzy.operations.enums.*;
 import com.cdzy.operations.mapper.*;
@@ -800,7 +801,15 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         if (point != null) {
             String loginId = StpUtil.getLoginIdAsString();
             CommonStaffInfo staffInfo = (CommonStaffInfo) StpUtil.getSession().get(loginId);
-            return regionMapper.findAllRegionsOrderByDistance(point, staffInfo.getOperatorId());
+            List<CommonEbikeRole> roles = staffInfo.getRoles();
+            boolean admin = Boolean.FALSE;
+            for (CommonEbikeRole role : roles) {
+                if (role.getSysAdmin()){
+                    admin = Boolean.TRUE;
+                    break;
+                }
+            }
+            return regionMapper.findAllRegionsOrderByDistance(point, staffInfo.getOperatorId(),admin);
         } 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 6b34100..1d89d2b 100644
--- a/ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml
+++ b/ebike-operations/src/main/resources/mapper/EbikeRegionMapper.xml
@@ -20,17 +20,21 @@
 
     <select id="findAllRegionsOrderByDistance" resultType="com.cdzy.operations.model.entity.EbikeRegion">
         SELECT
-            ebike_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
+        ebike_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
+        ebike_region
         WHERE
-            is_deleted IS NOT TRUE
+        is_deleted IS NOT TRUE
+        <if test="!isAdmin">
             AND operator_id = #{operatorId}
+        </if>
         ORDER BY
-            is_within_region DESC,
-            distance_meters
+        is_within_region DESC,
+        distance_meters
     </select>
 
     <resultMap id="FeignEbikeSiteVoMap" type="com.ebike.feign.model.vo.FeignEbikeSiteVo">