From 5aaa2c2e8aff05b4e22e991733be8be1786f05c0 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Fri, 8 Jul 2022 15:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/web/design/form/define/PageDataset.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java index dc54078..efe5fd7 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java @@ -98,16 +98,18 @@ public class PageDataset { } if (table == null) continue; ModelField mf = table.findField(field.field); - if (mf == null) throw new BizException("未找到表字段的定义信息（" + table.getName() + "." + field.field + "）"); +// if (mf == null) throw new BizException("未找到表字段的定义信息（" + table.getName() + "." + field.field + "）"); field.table_text = table.getTitle(); - field.fieldType = mf.getFieldType(); - field.notNull = mf.getNotNull(); - field.link = mf.getLink(); - - if (StringUtils.isEmpty(field.label)) field.label = mf.getTitle(); - if (StringUtils.isEmpty(field.dataType)) field.dataType = mf.getDataType(); - if (StringUtils.isEmpty(field.remark)) field.remark = mf.getRemark(); - if (StringUtils.isEmpty(field.editor)) field.editor = mf.getEditor(); + if (mf != null) { + field.fieldType = mf.getFieldType(); + field.notNull = mf.getNotNull(); + field.link = mf.getLink(); + + if (StringUtils.isEmpty(field.label)) field.label = mf.getTitle(); + if (StringUtils.isEmpty(field.dataType)) field.dataType = mf.getDataType(); + if (StringUtils.isEmpty(field.remark)) field.remark = mf.getRemark(); + if (StringUtils.isEmpty(field.editor)) field.editor = mf.getEditor(); + } //过滤条件，需要建立依赖关系 if (isFilter) { PageDatasetFilter filter = (PageDatasetFilter) field;