From 7ba995f514c6d20a59cc69afa05110110e9b2de5 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 09 十月 2023 08:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/skwcs' into skwcs

---
 src/main/java/com/zy/common/utils/NavigateMapData.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 2ce2ea4..9d550f2 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -198,7 +198,12 @@
             } else if (mapType == NavigationMapType.DFX.id) {
                 //杞﹁締鏈夎揣
                 //璇诲彇瀵瑰簲搴撲綅鏁版嵁锛屽皢DFX搴撲綅鐘舵�佺殑鑺傜偣缃负-1(闅滅鐗�)
-                if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || locMast.getLocSts().equals("X")) {
+                if (locMast.getLocSts().equals("F")
+                        || locMast.getLocSts().equals("D")
+                        || locMast.getLocSts().equals("X")
+                        || locMast.getLocSts().equals("R")
+                        || locMast.getLocSts().equals("P")
+                ) {
                     mapNode.setValue(-1);//绂佺敤鑺傜偣
                 }
             } else if (mapType == NavigationMapType.NORMAL.id) {

--
Gitblit v1.9.1