From f4729ec42978bea6fe1a6d6f73e5c4ad882356e8 Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 27 Jan 2022 07:23:52 +0000 Subject: [PATCH 1/2] * Adjust code --- module/mr/model.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/module/mr/model.php b/module/mr/model.php index 471121134a..8a88864859 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -440,7 +440,17 @@ class mrModel extends model if(!empty($MRList)) foreach($MRList as $key => $MR) { if($MR->status != 'opened') continue; - $rawMR = $this->apiGetSingleMR($MR->gitlabID, $MR->targetProject, $MR->mriid); + + if(!isset($rawMRList[$MR->gitlabID][$MR->targetProject])) $rawMRList[$MR->gitlabID][$MR->targetProject] = $this->apiGetMRList($MR->gitlabID, $MR->targetProject); + $rawMR = new stdClass(); + foreach($rawMRList[$MR->gitlabID][$MR->targetProject] as $projcetRawMR) + { + if($projcetRawMR->iid == $MR->mriid) + { + $rawMR = $projcetRawMR; + break; + } + } if(isset($rawMR->iid)) { From 81849859caec38c99d01b3972948b67017929b3c Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 27 Jan 2022 07:43:46 +0000 Subject: [PATCH 2/2] * Adjust code --- module/mr/model.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module/mr/model.php b/module/mr/model.php index 8a88864859..9a4c635d1e 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -433,11 +433,13 @@ class mrModel extends model * * @param object $MRList * @access public - * @return void + * @return array */ public function batchSyncMR($MRList) { - if(!empty($MRList)) foreach($MRList as $key => $MR) + if(empty($MRList)) return array(); + + foreach($MRList as $key => $MR) { if($MR->status != 'opened') continue;