diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java index f2c56e111..ea43647f4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java @@ -228,6 +228,7 @@ public class EnableMessageDevRuleController { v.setEnableSystemMessagePush(0); v.setEnableSystemMessagePromptTone(0); v.setEnableBroadcastNotification(0); + v.setParameterId(parameterId); return v; }); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java index 28df17ba3..3ca262d5a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java @@ -22,6 +22,7 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl; import com.zhgd.xmgl.modules.project.entity.EnableMessageDev; import com.zhgd.xmgl.modules.project.entity.EnableMessageDevRule; +import com.zhgd.xmgl.modules.project.entity.Project; import com.zhgd.xmgl.modules.project.entity.dto.EnableMessageDevRuleDto; import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevRuleVo; import com.zhgd.xmgl.modules.project.mapper.EnableMessageDevRuleMapper; @@ -55,6 +56,9 @@ public class EnableMessageDevRuleServiceImpl extends ServiceImpl companyUsers = systemUserService.getCompanyUserIdsByProjectSn(rule.getProjectSn()); if (CollUtil.isNotEmpty(companyUsers)) { - ids.addAll(companyUsers); + for (Long id : companyUsers) { + noticeService.addUserNoticeAndApp(id, title, project.getProjectName() + "," + msg, type, tone); + } } List systemUsers = systemUserService.getSystemUsersBySn(new MapBuilder().put(Cts.SN, rule.getProjectSn()).put(Cts.QUERY_TYPE, Cts.PROJECT_LEVEL).build()); if (CollUtil.isNotEmpty(systemUsers)) {