Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu

2021-07-01 16:22:07 +08:00
parent 2341965ff4 df46ea907b
commit 65e1feff0d
9 changed files with 26 additions and 22 deletions
@@ -1330,7 +1330,7 @@ class taskModel extends model
            ->check('left', 'float')
            ->where('id')->eq($taskID)->exec();
        
-        $relation = $this->loadModel('gitlab')->getGitlabIssueFromRelation('task', $taskID);
+        $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
        $attribute = new stdclass();
        $attribute->assignee_id = $this->loadModel('gitlab')->getGitlabUserID($relation->gitlabID, $task->assignedTo);
        if($attribute->assignee_id != '')