diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 914ebf5c..398db4c2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -227,7 +227,7 @@ public class PayMemberProjectSubitemController extends JeroController paymentType = sysBaseAPI.queryDictItemsByCode("payment_type"); Map paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); String paymentMethod = projectSubitemExcel.getPaymentMethod(); - if (paymentTypeMap.containsKey(paymentMethod)) { + if (StringUtils.isBlank(paymentMethod)){ + errorMessage.add("第" + errorRowNum + "行:来款方式不能为空"); + }else if (paymentTypeMap.containsKey(paymentMethod)) { projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod))); } else { errorMessage.add("第" + errorRowNum + "行:来款方式不符合规范"); @@ -244,7 +246,9 @@ public class PayMemberProjectSubitemController extends JeroController invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type"); Map invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); String needInvoice = projectSubitemExcel.getNeedInvoice(); - if (invoiceTypeMap.containsKey(needInvoice)) { + if (StringUtils.isBlank(needInvoice)){ + errorMessage.add("第" + errorRowNum + "行:需要发票不能为空"); + }else if (invoiceTypeMap.containsKey(needInvoice)) { projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice))); } else { errorMessage.add("第" + errorRowNum + "行:需要发票不符合规范");