diff --git a/src/main/java/com/example/cosmos_serversb/entities/Request.java b/src/main/java/com/example/cosmos_serversb/entities/Request.java index e5ca799..7557139 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Request.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Request.java @@ -44,7 +44,7 @@ this.done = false; } - public void update(String uId, String product, String deadline, int location, boolean done){ + public void update(String uId, String product, Date deadline, int location, boolean done){ setIssuerUid(uId); setProduct(product); setDeadline(deadline); @@ -97,11 +97,16 @@ } public void setDeadline(Date deadline) { + if(deadline == null){ + return; + } this.deadline = deadline; } public void setDeadline(String deadline) { - if(deadline == null) return; + if(deadline == null){ + return; + } //String型をDate型に変換 try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");