Преглед изворни кода

feat: 课程详情页新建、修改、删除公告

mjh пре 4 година
родитељ
комит
a76b1aa22f

+ 1 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/AnnouncementMapperImpl.java

@@ -49,7 +49,7 @@ public class AnnouncementMapperImpl implements AnnouncementMapper {
 
         announcement.setId(announcementVO.getId());
         announcement.setSenderId(announcementVO.getSender().getId());
-        announcement.setCourseId(announcementVO.getId());
+        announcement.setCourseId(announcementVO.getCourseId());
         announcement.setTitle(announcementVO.getTitle());
         announcement.setContent(announcementVO.getContent());
         announcement.setCreatedAt(announcementVO.getCreatedAt());

+ 7 - 4
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java

@@ -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);
     }