|
@@ -63,10 +63,10 @@ public class NoveltyReportTemplateService extends ServiceImpl<NoveltyReportTempl
|
|
|
noveltyReportTemplates = noveltyReportTemplatePage.getRecords();
|
|
|
total = noveltyReportTemplatePage.getTotal();
|
|
|
}
|
|
|
-// if (!noveltyReportTemplates.isEmpty()) {
|
|
|
-// queryTemplateVOS = this.loadTemplateVOS(noveltyReportTemplates);
|
|
|
-// }
|
|
|
- records.setData(noveltyReportTemplates);
|
|
|
+ if (!noveltyReportTemplates.isEmpty()) {
|
|
|
+ queryTemplateVOS = this.loadTemplateVOS(noveltyReportTemplates);
|
|
|
+ }
|
|
|
+ records.setData(queryTemplateVOS);
|
|
|
records.setCurrent(queryTemplateDTO.getCurrent());
|
|
|
records.setSize(queryTemplateDTO.getSize());
|
|
|
records.setTotal(total);
|