From 7337d6b1a7eb87b858f30fafd41bbea14f148921 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 二月 2026 09:09:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
index 4151d47..8cbd7ef 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
@@ -203,7 +203,7 @@
if (ElectricFenceUtil.areaMonitoring(collect, dto.getLongitude()+","+dto.getLatitude())) {
String fenceId = polygon.getFenceId();
R<XpElectronicFence> xpElectronicFence = xpElectronicFenceClient.selectById(fenceId);
- if(xpElectronicFence!=null){
+ if(xpElectronicFence!=null && null != xpElectronicFence.getData()){
String operationStrategy = xpElectronicFence.getData().getOperationStrategy();
Boolean inOperationTime = isInOperationTime(operationStrategy);
if(inOperationTime){
--
Gitblit v1.7.1