From de848b9faf23f0ffb68b44f0e17368ac7f52fd44 Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Thu, 8 Jul 2021 09:29:29 +0800
Subject: [PATCH] * Fix code format.

---
 module/gitlab/model.php | 4 ++--
 module/task/control.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 1108b86548..85dc58983d 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -543,7 +543,7 @@ class gitlabModel extends model
     public function apiGetSingleIssue($gitlabID, $projectID, $issueID)
     {
         $url = sprintf($this->getApiRoot($gitlabID), "/projects/$projectID/issues/{$issueID}");
-        $aaa =  json_decode(commonModel::http($url));
+        return json_decode(commonModel::http($url));
     }
 
     /**
@@ -583,7 +583,7 @@ class gitlabModel extends model
     public function apiCreateIssue($gitlabID, $projectID, $objectType, $objectID, $object)
     {
         $label = $this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID);
-
+        if(!isset($object->id)) $object->id = $objectID;
         $issue = $this->loadModel('gitlab')->parseObjectToIssue($gitlabID, $projectID, $objectType, $object);
         if(isset($label->name)) $issue->labels = $label->name;
         foreach($this->config->gitlab->skippedFields->issueCreate[$objectType] as $field)
diff --git a/module/task/control.php b/module/task/control.php
index fa9dc689ac..5ec982cb8d 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -649,8 +649,7 @@ class task extends control
                 if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue;
 
                 $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
-                $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
-
+                if(!empty($task))$this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
                 $changes = $this->task->assign($taskID);
                 if(dao::isError()) die(js::error(dao::getError()));
                 $actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);