From 2e73cea68f214c619664bda4289e94a65ffaa003 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 4 Aug 2025 11:28:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=99=BA=E6=85=A7=E8=B6=85=E5=B8=82):?= =?UTF-8?q?=E8=B4=A7=E5=95=86=E5=AF=BC=E5=85=A5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/dto/supplier/SmErpSupplierImportDto.java | 2 +- .../pjcloud/supermarket/validarot/SupplierValidator.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) 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; } }