From 48f3afc99d13528bce9f87a806ed92975941633d Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 3 Jul 2018 11:05:22 +0800 Subject: [PATCH] =?UTF-8?q?BI-26025=20=E3=80=90=E4=BA=A7=E5=93=81=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E3=80=91=E6=A0=91=E6=95=B0=E6=8D=AE=E9=9B=86=E7=94=A8?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/data/datapane/preview/PreviewTableModel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/designer-base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java b/designer-base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java index 8ffe37659f..0124f94dc3 100644 --- a/designer-base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java +++ b/designer-base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java @@ -190,10 +190,12 @@ public class PreviewTableModel extends AbstractTableModel { s = Inter.getLocText("FR-Designer_Parameter_String"); if (!WorkContext.getCurrent().isLocal() && dataModel instanceof EmbeddedTDDataModel) { Class clzz = ((EmbeddedTDDataModel) dataModel).getColumnClass(column); - if (Number.class.isAssignableFrom(clzz)) { + if (clzz != null) { + if (Number.class.isAssignableFrom(clzz)) { s = Inter.getLocText("FR-Designer_Number");//bigdecimal - } else if (java.sql.Date.class.isAssignableFrom(clzz)) { - s = Inter.getLocText("FR-Designer_Date"); + } else if (java.sql.Date.class.isAssignableFrom(clzz)) { + s = Inter.getLocText("FR-Designer_Date"); + } } } } else if (o instanceof Integer) {