From 5abf03d353ffadff81e7ad8778d94ebc8a4a3800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 28 Oct 2021 15:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40676?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayCompanyManagementController.java       |  4 +++
 .../PayContactsManagementController.java      | 26 +++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

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<PayCompanyMan
 			dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
 			status = PayCompanyManagementCommon.STATUS1;
 		}
+		List<Object> excelData = super.getExcelData(request, PayCompanyManagement.class);
+		if (excelData.isEmpty()) {
+			throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
+		}
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> 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<PayContactsM
 	 public Result<?> 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<PayContactsM
 	@ApiOperation(value="联系人管理-excel导入数据", notes="联系人管理-excel导入数据")
     @PostMapping(value = "/importExcel")
     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;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {