diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java index 9d4c0b3b..5441fb68 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java @@ -126,6 +126,8 @@ public interface EamProjectMapper { List getAutoSendMailAddress(String site); + List getAllSiteList(); + IPage searchSopFileList(Page sysOssEntityPage,@Param("query") SysOssEntity inData); List getEmailsByUsernames(@Param("usernames")List userNames, @Param("site") String site); 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 006efc65..24e555d9 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 @@ -981,14 +981,20 @@ public class EamProjectServiceImpl implements EamProjectService { **/ @Override public void sendEmail() throws MessagingException, UnsupportedEncodingException { - List siteList = new ArrayList<>(); - siteList.add("2"); - siteList.add("3"); + // 通过 site 表动态获取启用站点,避免硬编码站点遗漏 + List siteList = EamProjectMapper.getAllSiteList(); + if (siteList == null || siteList.isEmpty()) { + logger.warn("定时发送邮件任务未获取到可用站点,任务结束。"); + return; + } // 从存储过程获取所有待发送邮件数据 List allUserSendEmailList = new ArrayList<>(); - for (int i = 0; i < siteList.size(); i++) { - allUserSendEmailList.addAll(EamProjectMapper.getAutoSendMailAddress(siteList.get(i))); + for (String site : siteList) { + if (StringUtils.isBlank(site)) { + continue; + } + allUserSendEmailList.addAll(EamProjectMapper.getAutoSendMailAddress(site)); } List oneUserSendEmailList = new ArrayList<>(); String previousUsername = null; diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml index d7ab2588..877c1077 100644 --- a/src/main/resources/mapper/pms/EamProjectMapper.xml +++ b/src/main/resources/mapper/pms/EamProjectMapper.xml @@ -743,4 +743,12 @@ END) WHERE id = #{projectPartId} + +