[HOTFIX] 目標がなかった場合、ログインできない問題を修正しました。
This commit is contained in:
@@ -378,9 +378,10 @@ 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();
|
||||||
|
|
||||||
GoalForm result = resultList.getFirst();
|
if (resultList.getFirst() != null) {
|
||||||
|
result = resultList.getFirst();
|
||||||
model.addAttribute("achievementRate", result.getAchievementRate());
|
model.addAttribute("achievementRate", result.getAchievementRate());
|
||||||
|
|
||||||
model.addAttribute("currentAmount", result.getCurrentAmount());
|
model.addAttribute("currentAmount", result.getCurrentAmount());
|
||||||
@@ -391,6 +392,20 @@ public class TransactionController {
|
|||||||
|
|
||||||
model.addAttribute("deadline", result.getDeadline());
|
model.addAttribute("deadline", result.getDeadline());
|
||||||
|
|
||||||
|
} else {
|
||||||
|
model.addAttribute("achievementRate", "目標を設定してください");
|
||||||
|
|
||||||
|
model.addAttribute("currentAmount", "目標を設定してください");
|
||||||
|
|
||||||
|
model.addAttribute("targetAmount", "目標を設定してください");
|
||||||
|
|
||||||
|
model.addAttribute("saving", userForm.getSaving());
|
||||||
|
|
||||||
|
model.addAttribute("deadline", "目標を設定してください");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
return "menu";
|
return "menu";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user