diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java index 44bed17..39f753b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/image/ApprovalImage.java @@ -192,11 +192,15 @@ approvalParam.put("approvalUser" + nodeSeq, ObjectUtils.isNotEmpty(user) ? user.getName() : ""); //设置时间 Calendar calendar = Calendar.getInstance(); - calendar.setTime(approvalLog.getFinishTime()); - approvalParam.put("year" + nodeSeq, calendar.get(Calendar.YEAR)); - approvalParam.put("month" + nodeSeq, calendar.get(Calendar.MONTH) + 1); - approvalParam.put("day" + nodeSeq, calendar.get(Calendar.DAY_OF_MONTH)); - approvalParam.put("approvalTime" + nodeSeq, new SimpleDateFormat("yyyy年MM月dd日").format(approvalLog.getFinishTime())); + //健壮性校验 + if (ObjectUtils.isNotEmpty(approvalLog.getFinishTime())) { + calendar.setTime(approvalLog.getFinishTime()); + approvalParam.put("year" + nodeSeq, calendar.get(Calendar.YEAR)); + approvalParam.put("month" + nodeSeq, calendar.get(Calendar.MONTH) + 1); + approvalParam.put("day" + nodeSeq, calendar.get(Calendar.DAY_OF_MONTH)); + approvalParam.put("approvalTime" + nodeSeq, new SimpleDateFormat("yyyy年MM月dd日").format(approvalLog.getFinishTime())); + } + //健壮性校验 if (ObjectUtils.isNotEmpty(approvalLog.getComment())) { //工作流新增理由 approvalParam.put("comment" + nodeSeq, approvalLog.getComment().getComment());