From da6a14067bbb3e98d8a1a41c6d7d9883b09e5fee Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 二月 2026 21:50:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 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