Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug
This commit is contained in:
+4
-4
@@ -207,9 +207,9 @@ class mrModel extends model
|
||||
if($optionType == 'userPairs')
|
||||
{
|
||||
$gitlabUserID = '';
|
||||
if(isset({$rawMR->$field}[0]))
|
||||
if(isset($rawMR->{$field}[0]))
|
||||
{
|
||||
$gitlabUserID = {$rawMR->$field}[0]->$options;
|
||||
$gitlabUserID = $rawMR->{$field}[0]->$options;
|
||||
}
|
||||
$value = zget($gitlabUsers, $gitlabUserID, '');
|
||||
}
|
||||
@@ -258,9 +258,9 @@ class mrModel extends model
|
||||
if($optionType == 'userPairs')
|
||||
{
|
||||
$gitlabUserID = '';
|
||||
if(isset({$rawMR->$field}[0]))
|
||||
if(isset($rawMR->{$field}[0]))
|
||||
{
|
||||
$gitlabUserID = {$rawMR->$field}[0]->$options;
|
||||
$gitlabUserID = $rawMR->{$field}[0]->$options;
|
||||
}
|
||||
$value = zget($gitlabUsers, $gitlabUserID, '');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user