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

Merge branch dev/bug-64247 of zentao/zentaopms (#10526)

Browse Source
This commit is contained in:
刘刚
2025-07-22 16:52:04 +08:00
committed by Gitfox
parent 8afaf02a0a 9d5c224bfa
commit 098db3e54b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+2
View File
@@ -3792,6 +3792,8 @@ class taskModel extends model
public function confirmStoryChange(int $taskID): bool
{
$task = $this->getByID($taskID);
if($task->storyVersion == $task->latestStoryVersion) return true;
$this->dao->update(TABLE_TASK)->set('storyVersion')->eq($task->latestStoryVersion)->where('id')->eq($taskID)->exec();
$this->dao->update(TABLE_TASKTEAM)->set('storyVersion')->eq($task->latestStoryVersion)->where('task')->eq($taskID)->andWhere('account')->eq($this->app->user->account)->exec();
if(dao::isError()) return false;
module/testcase/control.php
+1 -1
View File
@@ -1102,7 +1102,7 @@ class testcase extends control
if($case->story)
{
$story = $this->loadModel('story')->fetchBaseInfo($case->story);
if($story->version)
if($story->version != $case->storyVersion)
{
$this->dao->update(TABLE_CASE)->set('storyVersion')->eq($story->version)->where('id')->eq($caseID)->exec();
$this->loadModel('action')->create('case', $caseID, 'confirmed', '', $story->version);