Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r29031 -r29096 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 29031) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 29096) @@ -9767,14 +9767,24 @@ @SuppressWarnings("unchecked") @Override public void exportQueryUseRecord(String sql, ServletOutputStream outputStream) { - if(StringUtils.isEmpty(sql)){ - return; + try { + if(StringUtils.isBlank(sql)){ + throw new SystemException("参数错误!"); + } + List useRecordList = objectDao.findBySql(UseRecord.class.getSimpleName(), sql); + if(CollectionUtils.isEmpty(useRecordList)){ + throw new SystemException("使用记录不存在!"); + } + createUseRecordExportFile(useRecordList, outputStream); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + outputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } } - List useRecordList = objectDao.findBySql(UseRecord.class.getSimpleName(), sql); - if(CollectionUtils.isEmpty(useRecordList)){ - throw new SystemException("使用记录不存在!"); - } - createUseRecordExportFile(useRecordList, outputStream); } /** @@ -9784,7 +9794,7 @@ */ private void createUseRecordExportFile(List useRecordList, ServletOutputStream outputStream) { if(CollectionUtils.isEmpty(useRecordList)){ - return; + throw new SystemException("使用记录不存在!"); } HSSFWorkbook wb = buildExcelFile(outputStream); HSSFSheet sheet = wb.getSheetAt(0); Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js =================================================================== diff -u -r29089 -r29096 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 29089) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 29096) @@ -1029,7 +1029,9 @@ if(message != ''){ showResult(message); } - location.href = WWWROOT + "/disinfectsystem/useRecord/exportUseRecord.jsp?useRecordIds=" + useRecordIds; + if(useRecordIds != ''){ + location.href = WWWROOT + "/disinfectsystem/useRecord/exportUseRecord.jsp?useRecordIds=" + useRecordIds; + } } },{id:'formSubmitResult',xtype:'hidden',value:formSubmitResultInit} ]; var dwrCallParams = null;