修改bug#40461

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java

@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
@@ -15,10 +14,12 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.common.RoleCommon;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.ManagementMessageEnums;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.util.oConvertUtils;
@@ -637,6 +638,10 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
 			MultipartFile file = entity.getValue();// 获取上传文件对象
+			// 校验文件是否为excel
+			if(!ImportExcelUtil.checkExcelFile(file)){
+				throw new JeroBootException("请导入excel文件！");
+			}
 			ImportParams params = new ImportParams();
 			params.setTitleRows(1);
 			params.setHeadRows(1);
@@ -644,7 +649,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 				//导入Excel格式校验，看匹配的字段文本概率
 				Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), PayCompanyManagement.class, params);
 				if(!t){
-					throw new RuntimeException("导入Excel校验失败 ！");
+					throw new JeroBootException("导入Excel校验失败 ！");
 				}
 				List<PayCompanyManagement> list = ExcelImportUtil.importExcel(file.getInputStream(), PayCompanyManagement.class, params);
 				if(!CollectionUtils.isEmpty(list)){

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java

@@ -14,8 +14,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.common.util.oConvertUtils;
@@ -675,6 +677,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
 			MultipartFile file = entity.getValue();// 获取上传文件对象
+			// 校验文件是否为excel
+			if(!ImportExcelUtil.checkExcelFile(file)){
+				throw new JeroBootException("请导入excel文件！");
+			}
 			ImportParams params = new ImportParams();
 			params.setTitleRows(1);
 			params.setHeadRows(1);

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java

@@ -52,7 +52,7 @@ public class PayCompanyManagement implements Serializable {
 	@Excel(name = "公司地址", width = 15)
     @ApiModelProperty(value = "公司地址")
     @NotEmpty(message = "公司地址不能为空！")
-    @Size(max = 200, message = "公司地址长度不能大于200个字符")
+    @Size(max = 50, message = "公司地址长度不能大于50个字符")
     private String companyAddress;
 	/**公司电话*/
 	@Excel(name = "公司电话", width = 15)

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java

@@ -45,13 +45,13 @@ public class PayContactsManagement implements Serializable {
 	/**企业名称*/
 	@Excel(name = "企业名称", width = 15)
     @ApiModelProperty(value = "企业名称")
-    @Size(max = 200, message = "企业名称长度不能大于200个字符")
+    @Size(max = 50, message = "企业名称长度不能大于50个字符")
     private String companyName;
 	/**姓名*/
 	@Excel(name = "姓名", width = 15)
     @ApiModelProperty(value = "姓名")
     @NotEmpty(message = "姓名不能为空！")
-    @Size(max = 20, message = "姓名长度不能大于20个字符")
+    @Size(max = 50, message = "姓名长度不能大于50个字符")
     private String name;
 	/**性别（1:男，2:女）*/
 	@Excel(name = "性别", width = 15,dicCode="sex")
@@ -61,7 +61,7 @@ public class PayContactsManagement implements Serializable {
 	/**职务*/
 	@Excel(name = "职务", width = 15)
     @ApiModelProperty(value = "职务")
-    @Size(max = 20, message = "职务长度不能大于20个字符")
+    @Size(max = 50, message = "职务长度不能大于50个字符")
     private String post;
 	/**手机号*/
 	@Excel(name = "手机号", width = 15)