From e02c0184b9fccc51ac39bb9cfe33ad363c5e681a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 二月 2026 12:37:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateSolution.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index 6514e21..ef7d708 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -41,11 +41,12 @@
JSONObject map = row.get(j);
NavigateNode navigateNode = new NavigateNode(i, j);
+ String mergeType = map.getString("mergeType");
String nodeType = map.getString("type");
String nodeValue = map.getString("value");
if(nodeType == null) {
navigateNode.setValue(MapNodeType.DISABLE.id);
- }else if(nodeType.equals("devp") || nodeType.equals("merge")){
+ }else if(nodeType.equals("devp") || (nodeType.equals("merge") && mergeType.equals("devp"))) {
navigateNode.setValue(MapNodeType.NORMAL_PATH.id);
JSONObject valueObj = JSON.parseObject(map.getString("value"));
--
Gitblit v1.9.1