Merge branch 'zx_online_0910' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupNoticeServiceImpl.java

@@ -97,7 +97,7 @@ public class ImGroupNoticeServiceImpl extends ServiceImpl<ImGroupNoticeDao, ImGr
     public void del(Long noticeId) {
         ImGroupNotice imGroupNotice = baseMapper.selectById(noticeId);
         if(Objects.isNull(imGroupNotice)){
-            throw new BizException("群公告不存在");
+            throw new BizException("该群公告已被删除");
         }
         this.checkAdmin(imGroupNotice.getGroupId());
         baseMapper.deleteById(noticeId);
@@ -116,7 +116,7 @@ public class ImGroupNoticeServiceImpl extends ServiceImpl<ImGroupNoticeDao, ImGr
     public ImGroupNoticeDto getNotice(Long noticeId) {
         ImGroupNotice imGroupNotice = baseMapper.selectById(noticeId);
         if(Objects.isNull(imGroupNotice)){
-            throw new BizException("群公告不存在");
+            throw new BizException("该群公告已被删除");
         }
         ImGroupNoticeDto imGroupNoticeDto = JSON.parseObject(JSON.toJSONString(imGroupNotice), ImGroupNoticeDto.class);
         SysUser sysUser = sysUserFeignService.queryUserById(imGroupNotice.getOperatorId());
@@ -129,7 +129,7 @@ public class ImGroupNoticeServiceImpl extends ServiceImpl<ImGroupNoticeDao, ImGr
     @Transactional(rollbackFor = Exception.class)
     public void modify(ImGroupNoticeDto imGroupNotice) {
         if(Objects.isNull(baseMapper.selectById(imGroupNotice.getId()))){
-            throw new BizException("群公告不存在");
+            throw new BizException("该群公告已被删除");
         }
         Long userId = this.checkAdmin(imGroupNotice.getGroupId());
         Date date = new Date();
@@ -160,7 +160,7 @@ public class ImGroupNoticeServiceImpl extends ServiceImpl<ImGroupNoticeDao, ImGr
     public Long checkAdmin(String groupId){
         ImGroup imGroup = imGroupService.getById(groupId);
         if(Objects.isNull(imGroup)){
-            throw new BizException("群信息不存在");
+            throw new BizException("该群公告已被删除");
         }
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(!Objects.equals(sysUser.getId(),imGroup.getCreateBy())){