|
|
@@ -31,7 +31,7 @@ public class AnnouncementService {
|
|
|
|
|
|
public AnnouncementVO create(AnnouncementVO announcementVO) {
|
|
|
UserVO sender = userService.findUserById(announcementVO.getSender().getId());
|
|
|
- CourseVO course = courseService.getCourseById(announcementVO.getId());
|
|
|
+ CourseVO course = courseService.getCourseById(announcementVO.getCourseId());
|
|
|
if (!sender.getId().equals(course.getTeacher().getId())) {
|
|
|
throw new CustomErrorException("当前用户无权发布公告");
|
|
|
}
|
|
|
@@ -53,12 +53,15 @@ public class AnnouncementService {
|
|
|
|
|
|
public AnnouncementVO update(AnnouncementVO announcementVO) {
|
|
|
this.getAnnouncementById(announcementVO.getId());
|
|
|
- CourseVO course = courseService.getCourseById(announcementVO.getId());
|
|
|
+ CourseVO course = courseService.getCourseById(announcementVO.getCourseId());
|
|
|
if (!announcementVO.getSender().getId().equals(course.getTeacher().getId())) {
|
|
|
throw new PortalException(ExceptionType.ERROR, "当前用户无权修改公告");
|
|
|
}
|
|
|
- Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
|
|
|
- Announcement result = announcementRepository.save(announcement);
|
|
|
+ AnnouncementVO announcement = this.getAnnouncementById(announcementVO.getId());
|
|
|
+ announcement.setType(announcementVO.getType());
|
|
|
+ announcement.setTitle(announcementVO.getTitle());
|
|
|
+ announcement.setContent(announcementVO.getContent());
|
|
|
+ Announcement result = announcementRepository.save(announcementMapper.toAnnouncement(announcement));
|
|
|
return announcementMapper.toAnnouncementVO(result);
|
|
|
}
|
|
|
|