Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
liyuchun
2021-11-30 09:29:53 +08:00
parent 4906d6f51a 404a567b73
commit de202d29a8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+2 -2
View File
@@ -96,7 +96,7 @@ class mrModel extends model
if(isset($MR->jobID) && $MR->jobID)
{
$pipeline = $this->loadModel('job')->exec($MR->jobID);
if($pipeline->queue)
if(!empty($pipeline->queue))
{
$compile = $this->loadModel('compile')->getByQueue($pipeline->queue);
$MR->compileID = $compile->id;
@@ -186,7 +186,7 @@ class mrModel extends model
{
$pipeline = $this->loadModel('job')->exec($MR->jobID);
if($pipeline->queue && $MR->jobID != $oldMR->jobID)
if(!empty($pipeline->queue) && $MR->jobID != $oldMR->jobID)
{
$compile = $this->loadModel('compile')->getByQueue($pipeline->queue);
$MR->compileID = $compile->id;