Merge branch 'mayue_fix_bug21904' into 'master'

* Fix bug #21904. See merge request easycorp/zentaopms!3059
2022-04-21 07:18:06 +00:00
parent 47962dc5b2 5f5cc8768e
commit 3ac0ae876c
1 changed files with 3 additions and 1 deletions
@@ -753,7 +753,9 @@ class branchModel extends model
            ->andWhere('product')->eq($productID)
            ->fetchGroup('project');

-        $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('branch')->in($mergedBranches . ",$targetBranch")->exec();
+        $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('branch')->in($mergedBranches . ",$targetBranch")
+            ->andWhere('product')->eq($productID)
+            ->exec();
        foreach($linkedProject as $projectID => $projectProducts)
        {
            $plan = 0;