From e3fdbd81215f0da25661b92a7fe6249c50802cb0 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:23:36 +0800
Subject: [PATCH] =?UTF-8?q?2024.11.4=20=E6=96=87=E6=A1=A3=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=9B=B4=E6=96=B0=20=E5=AE=A1=E6=89=B9=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81=E6=98=AF=E5=90=A6=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PartProductGroupInformationController.java     | 4 ++++
 .../sys/modules/pms/service/Impl/EamProjectServiceImpl.java   | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java b/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java
index cb051832..73ab0afe 100644
--- a/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java
+++ b/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java
@@ -8,6 +8,7 @@ import com.xujie.sys.modules.part.data.PgPtmConditionData;
 import com.xujie.sys.modules.part.data.PtmConditionItemData;
 import com.xujie.sys.modules.part.data.PtmConditionProcessData;
 import com.xujie.sys.modules.part.entity.PartProductGroupInformationEntity;
+import com.xujie.sys.modules.part.mapper.PtmConditionProcessMapper;
 import com.xujie.sys.modules.part.service.*;
 import com.xujie.sys.modules.part.vo.PartProductGroupInformationVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,9 @@ public class PartProductGroupInformationController {
     @Autowired
     private PtmConditionProcessService ptmConditionProcessService;
 
+    @Autowired
+    private PtmConditionProcessMapper ptmConditionProcessMapper;
+
     /**
      * @description: 获取商品组列表
      * @author: jiayang_yue
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
index 95acbda8..a3ddc4e5 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
@@ -605,6 +605,9 @@ public class EamProjectServiceImpl implements EamProjectService {
                 emails += email.getEmail() + ";";
             }
         }
+        if (emails.equals("")) {
+            return;
+        }
         emails = emails.substring(0, emails.length() - 1);
         // 将emailAddress的每一列的值用;分割，如果有多个收件人，将第一个收件人设置为to，其他的设置为cc
         if (emails.contains(";")) {