1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -119,13 +119,6 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 //项目经理审核，默认为待审核状态
                 sheet.setStatus(1);
             }else if(auditSetting.getAuditType()==2){
-                if(sheet.getFirstCheckerId().equals(user.getId())){
-                    sheet.setReviewProcess(1);
-                    sheet.setStatus(1);
-                }else if(sheet.getFirstCheckerId().equals(user.getId())&&sheet.getSecondCheckerId().equals(user.getId())){
-                    sheet.setReviewProcess(2);
-                    sheet.setStatus(0);
-                }
                 if (sheet.getStatus() == null) {
                     sheet.setStatus(1);//默认提交时为待审核状态
                 }
@@ -525,11 +518,11 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
     public HttpRespMsg getDetail(Integer id) {
         String token = request.getHeader("TOKEN");
         ExpenseSheet expenseSheet = expenseSheetMapper.selectById(id);
-        if(expenseSheet.getFirstCheckerId()!=null){
+        if(!StringUtils.isEmpty(expenseSheet.getFirstCheckerId())){
             User user = userMapper.selectById(expenseSheet.getFirstCheckerId());
             expenseSheet.setFirstCheckerName(user.getName());
         }
-        if(expenseSheet.getSecondCheckerId()!=null){
+        if(!StringUtils.isEmpty(expenseSheet.getSecondCheckerId())){
             User user = userMapper.selectById(expenseSheet.getSecondCheckerId());
             expenseSheet.setSecondCheckerName(user.getName());
         }