[FIX] 目標がない人はログインできないバグを修正しました。

This commit is contained in:
s-choi
2026-09-25 15:14:39 +09:00
parent 9872405377
commit 2b3cecf55d

View File

@@ -378,34 +378,24 @@ public class TransactionController {
List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0) List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0)
.collect(Collectors.toList()); .collect(Collectors.toList());
GoalForm result = new GoalForm();
if (resultList.getFirst() != null) { if (!resultList.isEmpty()) {
result = resultList.getFirst(); GoalForm result = resultList.getFirst();
model.addAttribute("achievementRate", result.getAchievementRate()); model.addAttribute("achievementRate", result.getAchievementRate());
model.addAttribute("currentAmount", result.getCurrentAmount()); model.addAttribute("currentAmount", result.getCurrentAmount());
model.addAttribute("targetAmount", result.getTargetAmount()); model.addAttribute("targetAmount", result.getTargetAmount());
model.addAttribute("saving", userForm.getSaving()); model.addAttribute("saving", userForm.getSaving());
model.addAttribute("deadline", result.getDeadline()); model.addAttribute("deadline", result.getDeadline());
} else { } else {
model.addAttribute("achievementRate", "目標を設定してください"); model.addAttribute("achievementRate", "目標を設定してください");
model.addAttribute("currentAmount", "目標を設定してください"); model.addAttribute("currentAmount", "目標を設定してください");
model.addAttribute("targetAmount", "目標を設定してください"); model.addAttribute("targetAmount", "目標を設定してください");
model.addAttribute("saving", userForm.getSaving()); model.addAttribute("saving", userForm.getSaving());
model.addAttribute("deadline", "目標を設定してください"); model.addAttribute("deadline", "目標を設定してください");
} }
return "menu"; return "menu";
} }