|
|
@@ -1493,7 +1493,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(admin.getId());
|
|
|
//提取type=0的数据
|
|
|
Admin sendAdmin=adminMapper.selectById(admin.getReviewer());
|
|
|
-// noticeAid=sendAdmin.getId();
|
|
|
+ noticeAid=sendAdmin.getId();
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos0 = adminPublicReviewerBos.stream().filter(e1 -> e1.getType().equals(0)).collect(Collectors.toList());
|
|
|
//又
|
|
|
if (adminPublicReviewerBos0.size()>0){
|
|
|
@@ -1523,14 +1523,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
PublicReleaseLog log = new PublicReleaseLog(e.getId(), TokenManager.getAdminId(), logStatus, logMsg, new Date());
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
- systemWebSocketHandler.sendMessageToUser(noticeAid, new TextMessage("unread"));
|
|
|
- Notice n =new Notice();
|
|
|
- n.setId(UUID.randomUUID().toString());
|
|
|
- n.setAid(noticeAid);
|
|
|
- n.setNoticeType(NoticeStatus.PUBLIC_RELEASE_START.getCode());
|
|
|
- n.setContent(content.toString());
|
|
|
- n.setReaded(0);//未读
|
|
|
- asyncUtils.addNotice(n);
|
|
|
+ if (!Objects.isNull(noticeAid)){
|
|
|
+ systemWebSocketHandler.sendMessageToUser(noticeAid, new TextMessage("unread"));
|
|
|
+ Notice n =new Notice();
|
|
|
+ n.setId(UUID.randomUUID().toString());
|
|
|
+ n.setAid(noticeAid);
|
|
|
+ n.setNoticeType(NoticeStatus.PUBLIC_RELEASE_START.getCode());
|
|
|
+ n.setContent(content.toString());
|
|
|
+ n.setReaded(0);//未读
|
|
|
+ asyncUtils.addNotice(n);
|
|
|
+ }
|
|
|
if (pes.size()>0){
|
|
|
for (PublicExamine pe : pes) {
|
|
|
publicExamineMapper.updateByPridSelective(pe);
|