Merge pull request #7294 in DESIGN/design from bugfix/10.0 to release/10.0

* commit '95f61babb5afb76778c4f49b6aaa0e4392c93b7b':
  CHART-22211 甘特图用文件数据集日期显示异常

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java

@@ -93,13 +93,13 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
         ganttDefinition.setEndTime(endTime == null ? StringUtils.EMPTY : String.valueOf(endTime));
 
         Object markTime = markerTimeComboBox.getSelectedItem();
-        ganttDefinition.setMarkTime(isNoneObject(markTime) ? StringUtils.EMPTY : String.valueOf(markTime));
+        ganttDefinition.setMarkTime(isNoneObject(markTime) ? null : String.valueOf(markTime));
 
         Object process = processComboBox.getSelectedItem();
-        ganttDefinition.setProgress(isNoneObject(process) ? StringUtils.EMPTY : String.valueOf(process));
+        ganttDefinition.setProgress(isNoneObject(process) ? null : String.valueOf(process));
 
         Object taskID = taskIDComboBox.getSelectedItem();
-        ganttDefinition.setLinkID(isNoneObject(taskID) ? StringUtils.EMPTY : String.valueOf(taskID));
+        ganttDefinition.setLinkID(isNoneObject(taskID) ? null : String.valueOf(taskID));
     }
 
     private boolean isNoneObject(Object markTime) {
@@ -117,9 +117,9 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
             seriesComboBox.setSelectedItem(ganttDefinition.getSeriesName());
             startTimeComboBox.setSelectedItem(ganttDefinition.getStartTime());
             endTimeComboBox.setSelectedItem(ganttDefinition.getEndTime());
-            markerTimeComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getMarkTime()) ? NONE : ganttDefinition.getMarkTime());
-            processComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getProgress()) ? NONE : ganttDefinition.getProgress());
-            taskIDComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getLinkID()) ? NONE : ganttDefinition.getLinkID());
+            markerTimeComboBox.setSelectedItem(ganttDefinition.getMarkTime() == null ? NONE : ganttDefinition.getMarkTime());
+            processComboBox.setSelectedItem(ganttDefinition.getProgress() == null ? NONE : ganttDefinition.getProgress());
+            taskIDComboBox.setSelectedItem(ganttDefinition.getLinkID() == null ? NONE : ganttDefinition.getLinkID());
         }
 
     }