dengsixing 1 vuosi sitten
vanhempi
commit
c702042d39

+ 2 - 6
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateHouseJsonUtil.java

@@ -148,12 +148,8 @@ public class CreateHouseJsonUtil {
 			Map<String, String> parent = new HashMap<>();
 			String startParent = startMap.get(pointBean.getVectorId());
 			String endParent = endMap.get(pointBean.getVectorId());
-			if(StrUtil.isNotEmpty(startParent)){
-				parent.put(startParent, "start");
-			}
-			if(StrUtil.isNotEmpty(endParent)){
-				parent.put(endParent, "end");
-			}
+			parent.put(startParent, "start");
+			parent.put(endParent, "end");
 			pointBean.setParent(parent);
 		}
 		JSONArray pointArr = JSON.parseArray(JSON.toJSONString(pointBeans));

+ 8 - 4
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/FloorPlanUserUtil.java

@@ -147,8 +147,12 @@ public class FloorPlanUserUtil {
 			Map<String, String> parent = new HashMap<>();
 			String startParent = startMap.get(pointBean.getVectorId());
 			String endParent = endMap.get(pointBean.getVectorId());
-			parent.put(startParent, "start");
-			parent.put(endParent, "end");
+			if(StrUtil.isNotEmpty(startParent)){
+				parent.put(startParent, "start");
+			}
+			if(StrUtil.isNotEmpty(endParent)){
+				parent.put(endParent, "end");
+			}
 			pointBean.setParent(parent);
 		}
 		JSONArray pointArr = JSON.parseArray(JSON.toJSONString(pointBeans));
@@ -163,7 +167,7 @@ public class FloorPlanUserUtil {
 		return result;
 
 	}
-	
+
 	private static JSONArray readFloorJson(String filePath) {
 		try {
 			JSONObject floorplan = FileUtils.readJson(filePath);
@@ -174,7 +178,7 @@ public class FloorPlanUserUtil {
 			return null;
 		}
 	}
-	
+
 }