优化修改

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -66,6 +66,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -153,7 +154,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		//获取要导出的列表
 		List<TPaymentInfoBatchVo> list = new ArrayList<>();
 		Integer count = baseMapper.selectCountTPaymentInfo(searchVo);
-		try (ServletOutputStream out = response.getOutputStream()) {
+		ServletOutputStream out = null;
+		try {
+			out = response.getOutputStream();
 			response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
 			response.setCharacterEncoding("utf-8");
 			response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, "UTF-8"));
@@ -184,9 +187,19 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				list.clear();
 			}
 			out.flush();
-			excelWriter.finish();
+			if (excelWriter!= null){
+				excelWriter.finish();
+			}
 		} catch (Exception e) {
 			log.error("执行异常", e);
+		} finally {
+			try {
+				if (null != out) {
+					out.close();
+				}
+			} catch (IOException e) {
+				log.error("执行异常", e);
+			}
 		}
 	}
 
@@ -202,7 +215,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		//获取要导出的列表
 		List<TPaymentInfoExportVo> list = new ArrayList<>();
 		Integer count = baseMapper.selectCountSumPaymentInfo(searchVo);
-		try (ServletOutputStream out = response.getOutputStream()) {
+		ServletOutputStream out = null;
+		try {
+			out = response.getOutputStream();
 			response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
 			response.setCharacterEncoding("utf-8");
 			response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, "UTF-8"));
@@ -236,6 +251,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			excelWriter.finish();
 		} catch (Exception e) {
 			log.error("执行异常", e);
+		} finally {
+			try {
+				if (null != out) {
+					out.close();
+				}
+			} catch (IOException e) {
+				log.error("执行异常", e);
+			}
 		}
 	}