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 { * @param point 用户当前位置 * @return 列表 */ - List findAllRegionsOrderByDistance(Point point,Long operatorId); + List 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 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 @@