From edadbf86ecb00f6e302d0d9f1a068efeb82d8777 Mon Sep 17 00:00:00 2001 From: s-choi Date: Tue, 29 Sep 2026 16:08:10 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]=20=E6=97=A2=E5=AD=98=E3=81=AE=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=81=AF=E5=89=8A=E9=99=A4=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/app/domain/service/impl/CourseServiceImpl.java | 2 ++ .../demo/app/presentation/controller/CourseController.java | 6 +++++- src/main/resources/templates/select_course.html | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) 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}"> -