Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33356 -r33357 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33356) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33357) @@ -23219,7 +23219,7 @@ .append(dateQueryAdapter.dateAdapter(endDate+" 23:59:59")) .append(") and fd.formName='") .append(formName) - .append("' and fdi.isReportDisplay='是' order by fdi.orderNumber,fdio.orderNumber asc"); + .append("' and fdi.isReportDisplay='是' order by fd.version desc,fdi.orderNumber,fdio.orderNumber asc"); ResultSet rs = null; Map> columnNameMap = new LinkedHashMap>(); Map columnWidthMap = new LinkedHashMap();