#

Junjie

10 小时以前 f97c8c0c36f81028de156c861b73d73428a1f415

 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"));