Merge branch dev/bug-64400 of zentao/zentaopms (#10940)

This commit is contained in:
刘刚
2025-08-14 14:04:58 +08:00
committed by Gitfox
+1 -1
View File
@@ -324,7 +324,7 @@ class branch extends control
$targetBranch = $this->branch->mergeBranch($productID, $branchIdList, $postData);
if(dao::isError()) return $this->sendError(dao::getError());
$this->loadModel('action')->create('branch', $targetBranch, 'MergedBranch', '', implode(',', $mergedBranches));
$this->loadModel('action')->create('branch', $targetBranch, 'MergedBranch', '', implode(',', array_keys($mergedBranches)));
if(dao::isError()) return $this->sendError(dao::getError());
}
return $this->sendSuccess(array('load' => true, 'closeModel' => true));