From 17b8fad8bbf13dd6f6e2c1e300856c52dce4f3ee Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 12 十二月 2025 14:45:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeResourceController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeResourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeResourceController.java
index 593fb50..3c0c061 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeResourceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeResourceController.java
@@ -201,38 +201,47 @@
for (LargeResourceImport largeResourceImport : largeResourceImports) {
if (!StringUtils.hasLength(largeResourceImport.getTypeParentName())){
result.append("第"+i+"行：[", "一级类型名称"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeResourceImport.getTypeChildrenName())){
result.append("第"+i+"行：[", "二级类型名称"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeResourceImport.getResourceUnit())){
result.append("第"+i+"行：[", "资源单位"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeResourceImport.getResourceNameDesc())){
result.append("第"+i+"行：[", "资源名称描述"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeResourceImport.getResourceSource())){
result.append("第"+i+"行：[", "资源来源"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeResourceImport.getQuantityScale())){
result.append("第"+i+"行：[", "数量规模"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeResourceImport.getContactPerson())){
result.append("第"+i+"行：[", "联系人"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeResourceImport.getContactNumber())){
result.append("第"+i+"行：[", "联系电话"+"]不能为空");
+ i++;
continue;
}
- if (largeResourceImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
+ if (!largeResourceImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
+ i++;
continue;
}
TLargeResource largeResource = new TLargeResource();
@@ -243,6 +252,7 @@
.last("LIMIT 1"));
if(Objects.isNull(parent)){
result.append("第"+i+"行：[", "一级类型名称"+"]不存在");
+ i++;
continue;
}
largeResource.setTypeParentId(parent.getId());
@@ -252,6 +262,7 @@
.last("LIMIT 1"));
if(Objects.isNull(children)){
result.append("第"+i+"行：[", "二级类型名称"+"]不存在");
+ i++;
continue;
}
largeResource.setTypeChildrenId(children.getId());
--
Gitblit v1.7.1