From eb3538de81c6025edb4a72345888d4c2169c4e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Fri, 13 Nov 2020 16:59:33 +0800
Subject: [PATCH] =?UTF-8?q?CHART-14142=09=E9=92=BB=E5=8F=96=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=90=8C=E5=90=8D=E5=8C=BA=E5=9F=9F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/chartx/fields/diff/MapDataSetFieldsPane.java    | 4 ++--
 .../data/contentpane/table/VanMapTableDataContentPane.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java
index 250e021c49..b813f2dc01 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java
@@ -18,11 +18,11 @@ import com.fr.plugin.chart.vanchart.VanChart;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.tree.DefaultMutableTreeNode;
+import java.util.Set;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Set;
 
 /**
  * @author Bjorn
@@ -64,7 +64,7 @@ public abstract class MapDataSetFieldsPane<T extends ColumnFieldCollectionWithSe
             public void actionPerformed(ActionEvent e) {
                 VanChartMapPlot plot = chart.getPlot();
                 if (treeNodeAndItems == null) {
-                    treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType());
+                    treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType(), true);
                 }
                 final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems);
 
diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java
index 09d72a72e6..0006f5e22c 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java
@@ -71,7 +71,7 @@ public abstract class VanMapTableDataContentPane extends AbstractTableDataConten
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (treeNodeAndItems == null) {
-                    treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType());
+                    treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType(), true);
                 }
                 final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems);