From 1bc22056398708491721f7603d7cebe85e5a81f7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 十月 2024 17:16:22 +0800
Subject: [PATCH] 1

---
 src/main/java/com/se/simu/service/GedbService.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/se/simu/service/GedbService.java b/src/main/java/com/se/simu/service/GedbService.java
index 1ae9652..7e51ebd 100644
--- a/src/main/java/com/se/simu/service/GedbService.java
+++ b/src/main/java/com/se/simu/service/GedbService.java
@@ -1,6 +1,5 @@
 package com.se.simu.service;
 
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
@@ -233,17 +232,21 @@
         List<String> bsm = getValues(point, "bsm");
         List<String> bsm2 = new ArrayList<>(bsm);
         List<String> qdbsm = getValues(line, "qdbsm");
+        List<String> qdbsm2 = new ArrayList<>(qdbsm);
         List<String> zdbsm = getValues(line, "zdbsm");
+        List<String> zdbsm2 = new ArrayList<>(zdbsm);
 
-        bsm.removeAll(qdbsm);
-        bsm.removeAll(zdbsm);
         qdbsm.removeAll(bsm2);
         zdbsm.removeAll(bsm2);
-
-        removeValues(point, "bsm", bsm);
         removeValues(line, "qdbsm", qdbsm);
         removeValues(line, "zdbsm", zdbsm);
 
+        qdbsm = getValues(line, "qdbsm");
+        zdbsm = getValues(line, "zdbsm");
+        bsm.removeAll(qdbsm);
+        bsm.removeAll(zdbsm);
+        removeValues(point, "bsm", bsm);
+
         GeLayer juncLayer = new GeLayer(point, filterLayerData(point.getData()));
         juncLayer.setName("闆嗘按鐐�");
         juncLayer.setShpName(config.getJunctionName());

--
Gitblit v1.9.3