Merge branch 'sprint/fixbug_liumengyi_2441' into 'master'

* Fix bug #2441. See merge request easycorp/zentaopms!3198
2022-04-28 08:26:06 +00:00
parent af548546d7 2780f01d00
commit e6c646f6bd
1 changed files with 1 additions and 1 deletions
@@ -105,7 +105,7 @@ class taskModel extends model
            /* Check duplicate task. */
            if($task->type != 'affair' and $task->name)
            {
-                $result = $this->loadModel('common')->removeDuplicate('task', $task, "execution={$executionID} and story=" . (int)$task->story);
+                $result = $this->loadModel('common')->removeDuplicate('task', $task, "execution={$executionID} and story=" . (int)$task->story . (isset($task->feedback) ? " and feedback=" . (int)$task->feedback : ''));
                if($result['stop'])
                {
                    $taskIdList[$assignedTo] = array('status' => 'exists', 'id' => $result['duplicate']);