From c64ca12b8679d73fc7f8109f0e08fa8c74352164 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 12:46:39 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
index 7aede07..a8c61e0 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
@@ -109,7 +109,7 @@
     }
 
     public Integer getResidueDay() {
-        int day = this.changeDay;
+        int day = Objects.isNull(this.changeDay)?0:this.changeDay;
         if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
             Date date = new Date();
             int days = DateUtils.getDays(escalationTime, date);

--
Gitblit v1.8.0