From 5e9d47b062a5e8edc722ae5d79594a78a2646593 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 10 Aug 2020 11:31:50 +0800
Subject: [PATCH]  * Finish task #7613.

---
 module/task/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 717fbfcf1e..ada7448de2 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1056,8 +1056,9 @@ class taskModel extends model
         }
 
         /* Check field not empty. */
-        foreach($tasks as $task)
+        foreach($tasks as $taskID => $task)
         {
+            if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
             if($task->status == 'cancel') continue;
             foreach(explode(',', $this->config->task->edit->requiredFields) as $field)
             {
@@ -1075,7 +1076,6 @@ class taskModel extends model
 
         foreach($tasks as $taskID => $task)
         {
-            if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
             $oldTask = $oldTasks[$taskID];
             $this->dao->update(TABLE_TASK)->data($task)
                 ->autoCheck()