From e1c82fff65a5e2761317d20ba2ab41195943c246 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 13 Sep 2017 12:45:08 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3837=20&=20REPORT-3805=20[9.0=E4=B8=80?=
 =?UTF-8?q?=E8=BD=AE=E5=9B=9E=E5=BD=92]=E6=97=A0=E6=B3=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=EF=BC=9B[9.0?=
 =?UTF-8?q?=E4=B8=80=E8=BD=AE=E5=9B=9E=E5=BD=92]=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=9C=89=E6=97=B6=E6=97=A0=E6=B3=95=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/editor/editor/ColumnSelectedEditor.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java
index 0f1c50a5f..7b5d76d2f 100644
--- a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java
+++ b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java
@@ -37,6 +37,9 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 			@Override
 			public void itemStateChanged(ItemEvent e) {
                 //这边需要重新初始化columnNames, 否则nameList长度和columnNames长度不同导致出錯。
+				if (tableDataComboBox.getSelectedItem() == null) {
+					return;
+				}
                 List<String> nameList = tableDataComboBox.getSelectedItem().calculateColumnNameList();
                 columnNames = new String[nameList.size()];
 				columnNames = tableDataComboBox.getSelectedItem().calculateColumnNameList().toArray(columnNames);
@@ -56,7 +59,7 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 
 	@Override
 	public SimpleDSColumn getValue() {
-		if (this.tableDataComboBox.getSelectedItem() == null && this.columnNameComboBox.getSelectedItem() == null) {
+		if (this.tableDataComboBox.getSelectedItem() == null || this.columnNameComboBox.getSelectedItem() == null) {
 			return null;
 		}
 		SimpleDSColumn dsColumn = new SimpleDSColumn();