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

* [error] fix code error.

Browse Source
This commit is contained in:
sunguangming
2025-03-12 09:17:39 +08:00
committed by 田淑杰
parent 5252951264
commit a1ed93db93
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/convert/model.php
+2 -1
View File
@@ -854,6 +854,7 @@ EOT;
if(strpos($userKey, 'JIRAUSER') !== false)
{
$userID = str_replace('JIRAUSER', '', $userKey);
if(!isset($users[$userID])) return '';
return $this->processJiraUser($users[$userID]->account, $users[$userID]->email);
}
else
@@ -999,7 +1000,7 @@ EOT;
$relations = $jiraRelation ? json_decode($jiraRelation, true) : array();
}
if(!empty($relations["zentaoStatus{$issueType}"][$jiraStatus])) return $relations["zentaoStatus{$issueType}"][$jiraStatus];
if(!empty($relations["zentaoStatus{$issueType}"][$jiraStatus])) return (string)$relations["zentaoStatus{$issueType}"][$jiraStatus];
if($objectType == 'testcase' && empty($this->config->testcase->needReview)) return 'normal';
if($objectType == 'feedback' && empty($this->config->feedback->needReview)) return 'normal';
module/convert/tao.php
+4 -1
View File
@@ -1039,7 +1039,7 @@ class convertTao extends convertModel
$member->days = 0;
$member->hours = $this->config->execution->defaultWorkhours;
$this->dao->dbh($this->dbh)->insert(TABLE_TEAM)->data($member)->exec();
$this->dao->dbh($this->dbh)->replace(TABLE_TEAM)->data($member)->exec();
return true;
}
@@ -1112,6 +1112,7 @@ class convertTao extends convertModel
foreach($projectRoleActor[$data->id] as $userID)
{
$account = $this->getJiraAccount($userID);
if(!$account) continue;
if($account == $project->openedBy) continue;
$this->createTeamMember($projectID, $account, 'project');
@@ -1167,6 +1168,7 @@ class convertTao extends convertModel
foreach($projectRoleActor[$jiraProjectID] as $userID)
{
$account = $this->getJiraAccount($userID);
if(!$account) continue;
if($account == $execution->openedBy) continue;
$this->createTeamMember($executionID, $account, 'execution');
@@ -1231,6 +1233,7 @@ class convertTao extends convertModel
foreach($projectRoleActor[$jiraProjectID] as $userID)
{
$account = $this->getJiraAccount($userID);
if(!$account) continue;
if($account == $execution->openedBy) continue;
$this->createTeamMember($executionID, $account, 'execution');