Commit 868741b0 authored by frank.xa.zhang's avatar frank.xa.zhang

fixed formula bb datasource can't display issue

parent 05578079
......@@ -424,7 +424,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
itemValues.add(a.getItemValue());
}
});
if (dataSourceDetailList.size() > 0) {
if (dataSourceDetailList.size() > 0 && dataSourceDetailList.get(0).getDataSourceType() != 6) {
dseo.setDataSourceType(convertType(dataSourceDetailList.get(0).getDataSourceType()));
}
dseo.setItems(itemValues);
......@@ -440,7 +440,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
dataSourceDto.setOperationType(a.getOperationType());
dataSourceDto.setDescription(a.getDescription());
dataSourceDto.setCreateTime(a.getCreateTime());
if (a.getDataSourceType()!=null&& a.getDataSourceType() > 0) {
if (a.getDataSourceType() != null && a.getDataSourceType() > 0) {
dataSourceDto.setType(convetToFType(a.getDataSourceType()));
} else {
dataSourceDto.setType(a.getType());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment