1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -57,6 +57,7 @@ public enum YExceptionEnum {
 	PETTY_ERROR("ERROR", "所有备用金账户余额剩余小于0！"),
 	CLOCK_ERROR("ERROR", "上班时间未打卡"),
 	CARNO_ERROR("ERROR", "当前车牌号有未通过审核的申请，请通过审核后继续添加！"),
+	EXE_ERROR("ERROR", "错误"),
 	;
 	@Getter
 	private String value;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -595,15 +595,19 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         List<NoticeTaskInfo> noticeTaskInfoList = noticeTaskService.selectList(new EntityWrapper<NoticeTaskInfo>()
             .eq("business_id",expenseInfo.getId())
             .eq("vessel_id","点击切换任务状态")
-            .eq("business_code","FEIYONGGUANLI-APPROVE"));
+            .eq("business_code","FEIYONGGUANLI-APPROVE")
+            .eq("delete_flag","0"));
         if(!CollectionUtils.isEmpty(noticeTaskInfoList)){
             for(int i = 0;i<noticeTaskInfoList.size();i++){
                 noticeTaskInfoList.get(i).setDeleteFlag("1");
             }
             noticeTaskService.updateBatchById(noticeTaskInfoList);
             expenseInfo.setNoticeTaskInfoList(noticeTaskInfoList);
+            return "OK";
+        }
+        else{
+            throw new YException(YExceptionEnum.EXE_ERROR);
         }
-        return "OK";
     }
 
     @Override