修改bug#40676

This commit is contained in:
梁琦涛
2021-10-28 15:10:12 +08:00
parent df9164d321
commit 5abf03d353
2 changed files with 19 additions and 11 deletions
@@ -816,6 +816,10 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
dataSource = PayCompanyManagementCommon.DATA_SOURCE1; dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
status = PayCompanyManagementCommon.STATUS1; status = PayCompanyManagementCommon.STATUS1;
} }
List<Object> excelData = super.getExcelData(request, PayCompanyManagement.class);
if (excelData.isEmpty()) {
throw new JeroBootException("导入数据为空,请填写数据之后重新导入!");
}
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -825,6 +825,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
@ApiOperation(value="联系人管理-excel导入数据", notes="联系人管理-excel导入数据") @ApiOperation(value="联系人管理-excel导入数据", notes="联系人管理-excel导入数据")
@PostMapping(value = "/importExcel") @PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
List<Object> excelData = super.getExcelData(request, PayContactsManagement.class);
if (excelData.isEmpty()) {
throw new JeroBootException("导入数据为空,请填写数据之后重新导入!");
}
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {