diff --git a/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java b/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java index d222537..827253d 100644 --- a/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java +++ b/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java @@ -574,8 +574,9 @@ for (int j = 0; j < groups.get(i).getRequestList().getRequests().size(); j++) { //codeToNotificationに格納するArrayListを初期化 ArrayList notifications = new ArrayList<>(); + Date deadline = groups.get(i).getRequestList().getRequests().get(j).getDeadline(); //期限内かつ未達成のrequestのみ取得 - if (groups.get(i).getRequestList().getRequests().get(j).getDeadline().after(nowDate) && groups.get(i).getRequestList().getRequests().get(j).isDone() == false) { + if (( deadline == null || deadline.after(nowDate))&& groups.get(i).getRequestList().getRequests().get(j).isDone() == false) { //notificationを作成 Notification notification = new Notification(groups.get(i).getRequestList().getRequests().get(j),groups.get(i),null); //指定したkey(業番)を持っているHashMapがなければ作成する。