From 79d5402492a82421b94fcbf90be01adbf3c8e0e5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 十二月 2025 11:51:06 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
index f2b8498..87f13de 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
@@ -206,18 +206,22 @@
for (MerchantImport merchantImport : merchantImports) {
if (!StringUtils.hasLength(merchantImport.getMerchantName())){
result.append("第"+i+"行：[", "商户名称"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(merchantImport.getMerchantPhone())){
result.append("第"+i+"行：[", "商户电话"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(merchantImport.getTypeName())){
result.append("第"+i+"行：[", "商户分类"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(merchantImport.getAddress())){
result.append("第"+i+"行：[", "商户地址"+"]不能为空");
+ i++;
continue;
}
TMerchantType merchantType = merchantTypeService.getOne(Wrappers.lambdaQuery(TMerchantType.class)
@@ -225,6 +229,7 @@
.last("LIMIT 1"));
if(Objects.isNull(merchantType)){
result.append("第"+i+"行：[", "商户分类"+"]不存在");
+ i++;
continue;
}
TMerchant merchant = new TMerchant();
--
Gitblit v1.7.1