Merge branch 'sprint/220_liumengyi_62026' into 'master'

* Fix bug #23200. See merge request easycorp/zentaopms!4659
2022-07-26 08:13:44 +00:00
parent 649950fa21 174d226f86
commit 8456a1da21
1 changed files with 1 additions and 1 deletions
@@ -1673,7 +1673,7 @@ class taskModel extends model
        $estimate->left     = zget($_POST, 'left', 0);
        $estimate->work     = zget($task, 'work', '');
        $estimate->account  = $this->app->user->account;
-        $estimate->consumed = $estimate->consumed - $oldTask->consumed;
+        $estimate->consumed = !empty($oldTask->team) ? $estimate->consumed - $oldTask->team[$this->app->user->account]->consumed : $estimate->consumed - $oldTask->consumed;
        if($this->post->comment) $estimate->work = $this->post->comment;
        $this->addTaskEstimate($estimate);