diff --git a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java index 59e0f99..6e7abac 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java @@ -133,6 +133,8 @@ public class CourseServiceImpl implements CourseService { System.out.println("***********************ここでエラー1"); if (userEntity.getCourseEntity().getCourseId() == courseId) { return "selected"; + } else if (courseId <= 6) { + return "original"; } System.out.println("***********************ここでエラー2"); allocationRepository.deleteByCourseId(courseId); diff --git a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java index 7f047ba..257e6f4 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java @@ -141,9 +141,13 @@ public class CourseController { return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE; + } else if (condition.equals("original")) { + model.addAttribute("message", "既存のデータは削除できません"); + + return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE; } else if (condition.equals("ok")) { return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE; - } + } model.addAttribute("message", "エラーが発生しました"); return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE; diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index 88419b5..912dfe8 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -36,7 +36,8 @@ aria-controls="'collapse' + ${course.courseId}"> -