diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 5c1d005d..64b89b48 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -816,6 +816,10 @@ public class PayCompanyManagementController extends JeroController excelData = super.getExcelData(request, PayCompanyManagement.class); + if (excelData.isEmpty()) { + throw new JeroBootException("导入数据为空,请填写数据之后重新导入!"); + } MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 1dc0e8d5..c27f6500 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -657,17 +657,17 @@ public class PayContactsManagementController extends JeroController queryByIdMeeting(@RequestParam(name="id") String id) { LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); if(sysUser.getId().equals(id)) { - PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); - if (payContactsManagement == null) { - return Result.error("未找到对应数据"); - } - if (!StringUtils.isBlank(payContactsManagement.getPhone())) { - payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); - } - if (!StringUtils.isBlank(payContactsManagement.getEmail())) { - payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); - } - return Result.OK(payContactsManagement); + PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); + if (payContactsManagement == null) { + return Result.error("未找到对应数据"); + } + if (!StringUtils.isBlank(payContactsManagement.getPhone())) { + payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); + } + if (!StringUtils.isBlank(payContactsManagement.getEmail())) { + payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); + } + return Result.OK(payContactsManagement); }else{ return Result.OK("权限异常"); } @@ -825,6 +825,10 @@ public class PayContactsManagementController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { + List excelData = super.getExcelData(request, PayContactsManagement.class); + if (excelData.isEmpty()) { + throw new JeroBootException("导入数据为空,请填写数据之后重新导入!"); + } MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) {