Browse Source

Pull request #14744: REPORT-133032 【fr-fbp回归】模板数据集-点击预览或展开数据集报错

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release

* commit '4d6e7cee6956f1d1eba2c0ff32f644f9bf93f4a1':
  REPORT-133032 【fr-fbp回归】模板数据集-点击预览或展开数据集报错
fbp/merge
Destiny.Lin-林锦龙 4 months ago
parent
commit
91bf14ac2e
  1. 4
      designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

4
designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@ -586,13 +586,13 @@ public abstract class DesignTableDataManager {
TableDataSource source = TableDataSourceTailor.extractTableData(tableDataSource);
bean.setDataSource(source);
bean.setDataName(DataOperator.getTableDataName(source, tabledata));
bean.setParameterMap(parameterMap);
bean.setConvertMap(parameterMap);
if (checkBean(bean)) {
return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(bean).getTableData();
} else {
PreviewDataBean dataBean = new PreviewDataBean();
dataBean.setDataSource(tabledata);
dataBean.setParameterMap(parameterMap);
dataBean.setConvertMap(parameterMap);
dataBean.setStart(rowCount);
dataBean.setEnd(-1);
return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(dataBean).getTableData();

Loading…
Cancel
Save