fix 83171 会员管理-导入时--以下字段没有增加必填校验

jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java

@@ -213,6 +213,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			errorMessage.addAll(errorList);
 
 			String companyName = subitemExcel.getCompanyId();
+			if (StringUtils.isNotBlank(companyName)){
 				PayCompanyManagement companyManagement = companyManagementService.getCompanyByName(companyName);
 				if (companyManagement == null){
 					errorMessage.add("第" + errorRowNum + "行：" + "会员单位不存在");
@@ -249,10 +250,13 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 						subitem.setPostContactId(postContact.getId());
 					}
 				}
+			}
 
 			//会员性质
 			String memberNature = subitemExcel.getMemberNature();
-			if (!memberNatureMap.containsKey(memberNature)){
+			if (StringUtils.isBlank(memberNature)){
+
+			}else if (!memberNatureMap.containsKey(memberNature)){
 				errorMessage.add("第" + errorRowNum + "行：" + "会员性质不存在");
 			}else {
 				int memberNatureInt = Integer.parseInt(memberNatureMap.get(memberNature));
@@ -272,7 +276,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			}
 
 			String paymentMethod = subitemExcel.getPaymentMethod();
-			if (!paymentTypeMap.containsKey(paymentMethod)){
+			if (StringUtils.isBlank(paymentMethod)){
+
+			}else if (!paymentTypeMap.containsKey(paymentMethod)){
 				errorMessage.add("第" + errorRowNum + "行：" + "来款方式不存在");
 			}else {
 				int paymentMethodInt = Integer.parseInt(paymentTypeMap.get(paymentMethod));
@@ -288,7 +294,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 					queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,subitemExcel.getCompanyId());
 					List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
 					if(CollectionUtils.isEmpty(listPayIncomeContract)){
-						errorMessage.add("第" + errorRowNum + "行:合同号不存在");
+						errorMessage.add("第" + errorRowNum + "行：" + "合同号不存在");
 					}
 				}
 				if (Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY3)) {
@@ -298,7 +304,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 				}
 			}
 			String invoiceRequirements = subitemExcel.getInvoiceRequirements();
-			if (!invoiceTypeMap.containsKey(invoiceRequirements)){
+			if (StringUtils.isBlank(invoiceRequirements)){
+
+			}else if (!invoiceTypeMap.containsKey(invoiceRequirements)){
 				errorMessage.add("第" + errorRowNum + "行：" + "需要发票不存在");
 			}else {
 				int invoiceRequirementsInt = Integer.parseInt(invoiceTypeMap.get(invoiceRequirements));

jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java

@@ -76,6 +76,7 @@ public class TbMemberProjectSubitemExcelImport {
 
     /**缴费方式*/
     @Excel(name = "来款方式", width = 15)
+    @NotBlank(message = "来款方式不能为空")
     @Dict(dicCode = "payment_type")
     private String paymentMethod;