|
@@ -52,10 +52,10 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
|
|
|
List<String> typelist = null;
|
|
List<String> typelist = null;
|
|
|
noticePageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
|
|
noticePageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
|
|
|
if("0".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
|
|
if("0".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
|
|
|
- typelist=Arrays.asList("3");
|
|
|
|
|
|
|
+ typelist=Arrays.asList("1","3");
|
|
|
}
|
|
}
|
|
|
if("1".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
|
|
if("1".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
|
|
|
- typelist= Arrays.asList("1","2");
|
|
|
|
|
|
|
+ typelist= Arrays.asList("1");
|
|
|
}
|
|
}
|
|
|
return noticeMapper.page(CommonPageRequest.defaultPage(), noticePageParam,typelist);
|
|
return noticeMapper.page(CommonPageRequest.defaultPage(), noticePageParam,typelist);
|
|
|
}
|
|
}
|
|
@@ -77,9 +77,9 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
|
|
|
@Override
|
|
@Override
|
|
|
public void add(NoticeAddParam noticeAddParam) {
|
|
public void add(NoticeAddParam noticeAddParam) {
|
|
|
//如果他是管理员身份,是系统公告
|
|
//如果他是管理员身份,是系统公告
|
|
|
- if("0".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
|
|
|
|
|
- noticeAddParam.setPlatform(3);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if("1".equals(StpLoginUserUtil.getLoginUser().getEduIdentity())){
|
|
|
|
|
+ noticeAddParam.setPlatform(1);
|
|
|
|
|
+ }
|
|
|
Notice notice = BeanUtil.toBean(noticeAddParam, Notice.class);
|
|
Notice notice = BeanUtil.toBean(noticeAddParam, Notice.class);
|
|
|
notice.setNoticeStatus(0);
|
|
notice.setNoticeStatus(0);
|
|
|
notice.setCreateUserId(StpLoginUserUtil.getLoginUser().getId());
|
|
notice.setCreateUserId(StpLoginUserUtil.getLoginUser().getId());
|