Browse Source

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

fbp/release
Destiny.Lin 3 months ago
parent
commit
3fed4187f4
  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); TableDataSource source = TableDataSourceTailor.extractTableData(tableDataSource);
bean.setDataSource(source); bean.setDataSource(source);
bean.setDataName(DataOperator.getTableDataName(source, tabledata)); bean.setDataName(DataOperator.getTableDataName(source, tabledata));
bean.setParameterMap(parameterMap); bean.setConvertMap(parameterMap);
if (checkBean(bean)) { if (checkBean(bean)) {
return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(bean).getTableData(); return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(bean).getTableData();
} else { } else {
PreviewDataBean dataBean = new PreviewDataBean(); PreviewDataBean dataBean = new PreviewDataBean();
dataBean.setDataSource(tabledata); dataBean.setDataSource(tabledata);
dataBean.setParameterMap(parameterMap); dataBean.setConvertMap(parameterMap);
dataBean.setStart(rowCount); dataBean.setStart(rowCount);
dataBean.setEnd(-1); dataBean.setEnd(-1);
return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(dataBean).getTableData(); return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(dataBean).getTableData();

Loading…
Cancel
Save