From 88c011562980fcb4cc0739c0192ee5a345e5527c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Jul 2024 14:32:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=2086986=20=E5=8A=9F=E8=83=BD=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E6=88=90=E5=91=98=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4-=E5=AF=BC=E5=85=A5-=E4=B8=A4=E4=B8=AA=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E6=B2=A1=E6=9C=89=E5=81=9A=E4=BD=8D=E6=95=B0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SafetyCenterSubitemService.java      | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
index 2ce912df..5fbb1452 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java
@@ -335,10 +335,11 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
             wrapper.eq(SafetyCenterSubitem::getCompanyId,companyId);
             if (this.count(wrapper) > 0){
                 errorMessage.add("第" + errorRowNum + "行：成员单位当前项目中已经存在");
-                errorRowNum2 += contactsList.size();
-                continue;
             }
-
+            String remarks1 = subitemImport.getRemarks();
+            if (remarks1 != null && remarks1.length() > 200){
+                errorMessage.add("第" + errorRowNum + "行：成员单位备注最长为200字符");
+            }
             Integer projectType = safetyCenter.getProjectType();
             List<String> parentContactIdList = new ArrayList<>();
             if (SafetyCenterCommon.PROJECT_TYPE_1 != projectType) {
@@ -386,9 +387,14 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
                         continue;
                     }
                 }
+                String remarks = contactsImport.getRemarks();
+                if (remarks != null && remarks.length() > 50){
+                    errorMessage.add("第" + errorRowNum2 + "行：企业联系人备注最长为50字符");
+                    continue;
+                }
                 SafetyCenterSubitemContacts contacts1 = new SafetyCenterSubitemContacts();
                 contacts1.setContactsId(payContactsManagement.getId());
-                contacts1.setRemarks(contactsImport.getRemarks());
+                contacts1.setRemarks(remarks);
                 subitemContactsList.add(contacts1);
             }
             if (!errorMessage.isEmpty()){
@@ -397,7 +403,7 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
             SafetyCenterSubitem subitem = new SafetyCenterSubitem();
             subitem.setProjectId(projectId);
             subitem.setCompanyId(companyId);
-            subitem.setRemarks(subitemImport.getRemarks());
+            subitem.setRemarks(remarks1);
             subitem.setContactsList(subitemContactsList);
             try {
                 this.add(subitem);