diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/supplier/SmErpSupplierImportDto.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/supplier/SmErpSupplierImportDto.java index 3e539cd5b..d26001aef 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/supplier/SmErpSupplierImportDto.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/supplier/SmErpSupplierImportDto.java @@ -33,7 +33,7 @@ public class SmErpSupplierImportDto { @ExcelProperty("开户行及帐号") private String bankAccount; - @ExcelProperty("货商类") + @ExcelProperty("货商类别") private String supplierCategory; @ExcelProperty("货商地区") diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/validarot/SupplierValidator.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/validarot/SupplierValidator.java index 6ebf15230..036916334 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/validarot/SupplierValidator.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/validarot/SupplierValidator.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.supermarket.validarot; +import com.alibaba.excel.util.StringUtils; import com.bsd.pjcloud.supermarket.dto.supplier.SmErpSupplierImportDto; import org.springframework.stereotype.Component; @@ -14,9 +15,9 @@ public class SupplierValidator { if (entity.getSupplierName() == null || entity.getSupplierName().isEmpty()) { errors.add("第" + (rowIndex + 1) + "行: 货商名称不能为空"); } -// if (entity.getPhone()== null || entity.getPhone().isEmpty()) { -// errors.add("第" + (rowIndex + 1) + "行: 电话不能为空"); -// } + if (StringUtils.isBlank(entity.getSupplierCategory())) { + errors.add("第" + (rowIndex + 1) + "行: 货商类别不能为空"); + } return errors; } }