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/TLargeOrganizationController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeOrganizationController.java
index 10e5610..dad55c6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeOrganizationController.java
@@ -205,26 +205,32 @@
for (LargeOrganizationImport largeOrganizationImport : largeOrganizationImports) {
if (!StringUtils.hasLength(largeOrganizationImport.getOrganizationName())){
result.append("第"+i+"行：[", "组织名称"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeOrganizationImport.getOrganizationPerson())){
result.append("第"+i+"行：[", "组织负责人"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeOrganizationImport.getAddress())){
result.append("第"+i+"行：[", "地址"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeOrganizationImport.getContactNumber())){
result.append("第"+i+"行：[", "联系电话"+"]不能为空");
+ i++;
continue;
}
- if (largeOrganizationImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
+ if (!largeOrganizationImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeOrganizationImport.getBusinessScope())){
result.append("第"+i+"行：[", "业务范围"+"]不能为空");
+ i++;
continue;
}
TLargeOrganization largeOrganization = new TLargeOrganization();
--
Gitblit v1.7.1