|
@@ -592,10 +592,11 @@ public class NoticeServiceImpl implements NoticeService {
|
|
|
|
|
|
private NoticeRulePublishProgressEntity getNoticeRulePublishProgressEntityFrom(
|
|
|
AddNoticeInfo addNoticeInfo, Long noticeId) {
|
|
|
- NoticeRulePublishProgressEntity publishScheduleEntity = new NoticeRulePublishProgressEntity();
|
|
|
- publishScheduleEntity.setRootOrgId(addNoticeInfo.getRootOrgId());
|
|
|
- publishScheduleEntity.setNoticeId(noticeId);
|
|
|
- return publishScheduleEntity;
|
|
|
+ NoticeRulePublishProgressEntity progressEntity = new NoticeRulePublishProgressEntity();
|
|
|
+ progressEntity.setRootOrgId(addNoticeInfo.getRootOrgId());
|
|
|
+ progressEntity.setNoticeId(noticeId);
|
|
|
+ progressEntity.setNoticeReceiverRuleType(addNoticeInfo.getRuleType());
|
|
|
+ return progressEntity;
|
|
|
}
|
|
|
|
|
|
private NoticeEntity getNoticeEntityFrom(AddNoticeInfo addNoticeInfo) {
|
|
@@ -660,6 +661,7 @@ public class NoticeServiceImpl implements NoticeService {
|
|
|
NoticeRulePublishProgressEntity publishScheduleEntity = new NoticeRulePublishProgressEntity();
|
|
|
publishScheduleEntity.setRootOrgId(info.getRootOrgId());
|
|
|
publishScheduleEntity.setNoticeId(info.getId());
|
|
|
+ publishScheduleEntity.setNoticeReceiverRuleType(info.getRuleType());
|
|
|
return publishScheduleEntity;
|
|
|
}
|
|
|
|