Sfoglia il codice sorgente

修复通知更新报错的bug

lideyin 5 anni fa
parent
commit
7934218706

+ 1 - 1
examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/NoticeRulePublishProgressRepo.java

@@ -17,7 +17,7 @@ public interface NoticeRulePublishProgressRepo extends JpaRepository<NoticeRuleP
 
     @Transactional
     @Modifying
-    @Query(value="delete from EC_E_NOTICE_PUBLISH_SCHEDULE where root_org_id=?1 and notice_id in ?2",nativeQuery = true)
+    @Query(value="delete from EC_E_NOTICE_RULE_PUBLISH_PROGRESS where root_org_id=?1 and notice_id in ?2",nativeQuery = true)
     int deleteByRootOrgIdAndNoticeIdIn(Long rootOrgId,List<Long> noticeId);
 
     @Transactional

+ 3 - 1
examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/NoticeServiceImpl.java

@@ -194,7 +194,7 @@ public class NoticeServiceImpl implements NoticeService {
     @Override
     public NoticeRulePublishProgressEntity updateNotice(UpdateNoticeInfo info) {
         Long rootOrgId = info.getRootOrgId();
-        List<Long> noticeIdList = Collections.singletonList(info.getId());
+
         // 校验通知状态,正在发送的通知不允许修改
         NoticeEntity originalNotice = GlobalHelper.getEntity(noticeRepo, info.getId(),
                 NoticeEntity.class);
@@ -217,6 +217,8 @@ public class NoticeServiceImpl implements NoticeService {
         originalNotice.setUpdateTime(new Date());
         noticeRepo.save(originalNotice);
 
+        List<Long> noticeIdList = Collections.singletonList(info.getId());
+
         // 更新公告接收规则实体
         noticeReceiverRuleRepo.deleteByRootOrgIdAndNoticeIdIn(rootOrgId, noticeIdList);
         List<NoticeReceiverRuleEntity> ruleList = getNoticeReceiverRuleEntityListFrom(info);