From bbf2f15a17dc6fb20d654086c2b1a6ac2772083b Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 6 Mar 2024 11:03:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=BC=82=E5=B8=B8=EF=BC=9B=20opt=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BE=E6=9C=9F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/tbs/entity/TbsActivity.java | 22 +++++++++++++------
 .../TbsCostApplyOperationServiceImpl.java     |  6 +++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
index 67ce8389..a8584c99 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
@@ -305,15 +305,23 @@ public class TbsActivity implements Serializable {
             }
         }
         expenseApplicationActivityWriteOffOverdueWarningDays = preDays;
-        if(overdueWarningDays >= expenseApplicationActivityWriteOffOverdueWarningDays){
-            overdueState = 0;
-            overdueWarningDays=-overdueWarningDays;
-        }else if(overdueWarningDays<0){
-            overdueState = 1;
+        if(this.getActivityState().equals(0)||this.getActivityState().equals(1)||this.getActivityState().equals(3)){
+            if(overdueWarningDays >= expenseApplicationActivityWriteOffOverdueWarningDays){
+                overdueState = 0;
+            }else if(overdueWarningDays<0){
+                overdueState = 1;
+            }else {
+                overdueState = 2;
+            }
         }else {
-            overdueState = 2;
+            overdueState = 0;
+        }
+        //调为正数
+        overdueWarningDays = -overdueWarningDays;
+        //未逾期设置为0
+        if(overdueWarningDays <= 0){
+            overdueWarningDays = 0L;
         }
-
     }
 
 }
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
index 70e7c02f..15541fb4 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
@@ -224,6 +224,12 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
                         ctpAffairVo.setUserPostList(postUsers);
                     }
                 }
+                //部分用户不存在CMS，会导致前端页面异常
+                if(ctpAffairVo.getUserInfo()==null){
+                    SysUser user = new SysUser();
+                    user.setName(ctpAffairVo.getAffairInfo().getMemberId());
+                    ctpAffairVo.setUserInfo(user.toSysUserVo());
+                }
                 for (DataAffairCommit affairCommit : affairCommits) {
                     if(affairCommit.getId().equals(ctpAffair.getAffairId())){
                         ctpAffairVo.setCommitInfo(affairCommit);