This commit is contained in:
hufangzhou
2023-09-09 02:46:19 +00:00
parent 09d639517e
commit 7876712018
+4 -2
View File
@@ -1753,9 +1753,11 @@ class storyModel extends model
$story->reviewedDate = $now;
$story->lastEditedBy = $this->app->user->account;
$story->lastEditedDate = $now;
$story->reviewedBy = $oldStory->reviewedBy . ',' . $this->app->user->account;
$story->status = $oldStory->status;
$reviewedBy = array_unique(explode(',', $oldStory->reviewedBy . ',' . $this->app->user->account));
$story->reviewedBy = implode(',', $reviewedBy);
$this->dao->update(TABLE_STORYREVIEW)->set('result')->eq($result)->set('reviewDate')->eq($now)->where('story')->eq($storyID)->andWhere('version')->eq($oldStory->version)->andWhere('reviewer')->eq($this->app->user->account)->exec();
/* Sync twins. */
@@ -6792,7 +6794,7 @@ class storyModel extends model
if($col->name == 'estimate') $story->estimate .= $this->config->hourUnit;
if($col->name == 'reviewedBy')
{
$reviewers = array_filter(explode(',', $story->reviewedBy));
$reviewers = array_unique(array_filter(explode(',', $story->reviewedBy)));
$reviewers = array_map(function($reviewer) use($users){return zget($users, $reviewer);}, $reviewers);
$story->reviewedBy = join(' ', $reviewers);
}