空文件

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -736,6 +736,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			List<EmployeeContractExportVO> list = baseMapper.getTEmployeeContractExportHistory(contractInfo);
 			ServletOutputStream out = null;
 			if (list != null && !list.isEmpty()) {
+				list = new ArrayList<>();
+			}
 			try {
 				ExcelUtil<EmployeeContractExportVO> util = new ExcelUtil<>(EmployeeContractExportVO.class);
 				for (EmployeeContractExportVO vo : list) {
@@ -760,17 +762,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 					log.error("员工合同导出异常：", e);
 				}
 			}
-			} else {
-				EasyExcel.write(out, EmployeeExportVO.class).includeColumnFiledNames(contractInfo.getExportFields())
-						.sheet(EmployeeConstants.NO_DATA).doWrite(list);
-				try {
-					if (out != null) {
-						out.close();
-					}
-				} catch (IOException e) {
-					log.error(EmployeeConstants.CONCART_EXPORT_EXCEPTION, e);
-				}
-			}
 		}
 	}
 
@@ -785,6 +776,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			List<EmployeeContractExportVO> list = baseMapper.getTEmployeeContractExportHistory(contractInfo);
 			ServletOutputStream out = null;
 			if (list != null && !list.isEmpty()) {
+				list = new ArrayList<>();
+			}
 			try {
 				ExcelUtil<EmployeeContractExportVO> util = new ExcelUtil<>(EmployeeContractExportVO.class);
 				for (EmployeeContractExportVO vo : list) {
@@ -809,17 +802,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 					log.error(EmployeeConstants.CONCART_ALL_EXPORT_EXCEPTION, e);
 				}
 			}
-			} else {
-				EasyExcel.write(out, EmployeeExportVO.class).includeColumnFiledNames(contractInfo.getExportFields())
-						.sheet(EmployeeConstants.NO_DATA).doWrite(list);
-				try {
-					if (out != null) {
-						out.close();
-					}
-				} catch (IOException e) {
-					log.error(EmployeeConstants.CONCART_ALL_EXPORT_EXCEPTION, e);
-				}
-			}
+
 		}
 	}
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -1971,6 +1971,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 			List<EmployeeExportVO> list = baseMapper.getTEmployeeExportList(employeeInfo);
 			ServletOutputStream out = null;
 			if (list != null && !list.isEmpty()) {
+				list = new ArrayList<>();
+			}
 			try {
 				ExcelUtil<EmployeeExportVO> util = new ExcelUtil<>(EmployeeExportVO.class);
 				for (EmployeeExportVO vo : list) {
@@ -1995,17 +1997,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 					log.error(EmployeeConstants.FILE_EXPORT_EXCEPTION, e);
 				}
 			}
-			} else {
-				EasyExcel.write(out, EmployeeExportVO.class).includeColumnFiledNames(employeeInfo.getExportFields())
-						.sheet(EmployeeConstants.NO_DATA).doWrite(list);
-				try {
-					if (out != null) {
-						out.close();
-					}
-				} catch (IOException e) {
-					log.error(EmployeeConstants.FILE_EXPORT_EXCEPTION, e);
-				}
-			}
 		}
 	}
 
@@ -2021,6 +2012,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 			List<EmployeeExportVO> list = baseMapper.getTEmployeeLeaveExportList(employeeInfo);
 			ServletOutputStream out = null;
 			if (list != null && !list.isEmpty()) {
+				list = new ArrayList<>();
+			}
 			try {
 				ExcelUtil<EmployeeExportVO> util = new ExcelUtil<>(EmployeeExportVO.class);
 				for (EmployeeExportVO vo : list) {
@@ -2045,17 +2038,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 					log.error(EmployeeConstants.FILE_EXPORT_EXCEPTION, e);
 				}
 			}
-			} else {
-				EasyExcel.write(out, EmployeeExportVO.class).includeColumnFiledNames(employeeInfo.getExportFields())
-						.sheet(EmployeeConstants.NO_DATA).doWrite(list);
-				try {
-					if (out != null) {
-						out.close();
-					}
-				} catch (IOException e) {
-					log.error(EmployeeConstants.FILE_EXPORT_EXCEPTION, e);
-				}
-			}
 		}
 	}