Merge branch 'master_bug_30389' into 'master'

* Adjust code logic for 30389.

See merge request easycorp/zentaopms!6807
This commit is contained in:
王怡栋
2023-01-31 03:18:20 +00:00
2 changed files with 0 additions and 2 deletions
-1
View File
@@ -3066,7 +3066,6 @@ class execution extends control
/* Delete execution. */
$execution = $this->execution->getByID($executionID);
$this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->eq($executionID)->exec();
$this->dao->update(TABLE_BUG)->set('execution')->eq(0)->where('execution')->eq($executionID)->exec();
$this->loadModel('action')->create('execution', $executionID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
$this->execution->updateUserView($executionID);
$this->loadModel('common')->syncPPEStatus($executionID);
-1
View File
@@ -2044,7 +2044,6 @@ class project extends control
/* Delete the execution under the project. */
$executionIdList = $this->loadModel('execution')->getPairs($projectID);
$this->dao->update(TABLE_BUG)->set('execution')->eq(0)->where('execution')->in(array_keys($executionIdList))->exec();
/* Delete shadow product.*/
$project = $this->project->getByID($projectID);