From 134cd55f46aee8333ec6c6ead15884179060e9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 30 Dec 2021 10:31:19 +0800
Subject: [PATCH]  * adjust for task #46553.

---
 module/mr/model.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/module/mr/model.php b/module/mr/model.php
index ef93ad079c..cf23d16c21 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -160,10 +160,7 @@ class mrModel extends model
         $newMR->mergeStatus = $rawMR->merge_status;
 
         /* Update MR in Zentao database. */
-        $this->dao->update(TABLE_MR)->data($newMR)
-            ->where('id')->eq($MRID)
-            ->autoCheck()
-            ->exec();
+        $this->dao->update(TABLE_MR)->data($newMR)->where('id')->eq($MRID)->autoCheck()->exec();
         if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
         return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => helper::createLink('mr', 'browse'));
     }
@@ -238,13 +235,11 @@ class mrModel extends model
             else
             {
                 $newMR->compileStatus = $pipeline->status;
+                if($newMR->compileStatus == 'create_fail') $newMR->status = 'closed';
             }
 
             /* Update MR in Zentao database. */
-            $this->dao->update(TABLE_MR)->data($newMR)
-                ->where('id')->eq($MRID)
-                ->autoCheck()
-                ->exec();
+            $this->dao->update(TABLE_MR)->data($newMR)->where('id')->eq($MRID)->autoCheck()->exec();
             if(dao::isError()) return false;
         }
         return true;