fix: 修复审批结果异常；

opt：优化逾期显示

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){
+        if(this.getActivityState().equals(0)||this.getActivityState().equals(1)||this.getActivityState().equals(3)){
-            overdueState = 0;
+            if(overdueWarningDays >= expenseApplicationActivityWriteOffOverdueWarningDays){
-            overdueWarningDays=-overdueWarningDays;
+                overdueState = 0;
-        }else if(overdueWarningDays<0){
+            }else if(overdueWarningDays<0){
-            overdueState = 1;
+                overdueState = 1;
+            }else {
+                overdueState = 2;
+            }
         }else {
-            overdueState = 2;
+            overdueState = 0;
+        }
+        //调为正数
+        overdueWarningDays = -overdueWarningDays;
+        //未逾期设置为0
+        if(overdueWarningDays <= 0){
+            overdueWarningDays = 0L;
         }
-
     }
 
 }

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);