插入单元列排序按钮NPE fix

designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java

@@ -27,16 +27,19 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
         java.util.Map<String, TableDataWrapper> tableDataWrapperMap =
                 DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget());
         Map<String, TableDataWrapper> allDataSetIncludingProcedure = DesignTableDataManager.getAllDataSetIncludingProcedure(tableDataWrapperMap);
-        TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName());
+        if (dsColumn != null) {
-        if (tableDataWrapper != null) {
+            TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName());
-            java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList();
+            if (tableDataWrapper != null) {
-            String[] columnNames = new String[columnNameList.size()];
+                java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList();
-            columnNameList.toArray(columnNames);
+                String[] columnNames = new String[columnNameList.size()];
-            cellDSColumnSortItemPane.sortAreaUiComboBox.removeAllItems();
+                columnNameList.toArray(columnNames);
-            for (String columnName : columnNames) {
+                cellDSColumnSortItemPane.sortAreaUiComboBox.removeAllItems();
-                cellDSColumnSortItemPane.sortAreaUiComboBox.addItem(columnName);
+                for (String columnName : columnNames) {
+                    cellDSColumnSortItemPane.sortAreaUiComboBox.addItem(columnName);
+                }
             }
         }
+
         cellDSColumnSortItemPane.populateBean(sortExpression);
         return cellDSColumnSortItemPane;
     }