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(";")) {