diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/FlowMapHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/FlowMapHandler.java
index 0f63710e3b..6b1dba6c55 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/FlowMapHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/FlowMapHandler.java
@@ -7,6 +7,9 @@ import io.dataease.extensions.view.dto.ChartViewDTO;
 import lombok.Getter;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.Optional;
+
 @Component
 public class FlowMapHandler extends GroupChartHandler {
     @Getter
@@ -15,8 +18,8 @@ public class FlowMapHandler extends GroupChartHandler {
     public AxisFormatResult formatAxis(ChartViewDTO view) {
         var result = super.formatAxis(view);
         var xAxis = result.getAxisMap().get(ChartAxis.xAxis);
-        xAxis.addAll(view.getFlowMapStartName());
-        xAxis.addAll(view.getFlowMapEndName());
+        xAxis.addAll(Optional.ofNullable(view.getFlowMapStartName()).orElse(new ArrayList<>()));
+        xAxis.addAll(Optional.ofNullable(view.getFlowMapStartName()).orElse(new ArrayList<>()));
         result.getAxisMap().put(ChartAxis.xAxis, xAxis);
         return result;
     }