Merge branch feature/workflowgroup of zentao/zentaopms (#10759)

This commit is contained in:
刘刚
2025-08-05 09:34:02 +08:00
committed by Gitfox
+1 -1
View File
@@ -11346,7 +11346,7 @@ class upgradeModel extends model
/* 重名的交付物名称后面加数字。 */
if(!empty($nameFilter[$workflowGroup->id][$oldDeliverable->name]))
{
$deliverable->name = $oldDeliverable->name . $nameFilter[$oldDeliverable->name];
$deliverable->name = $oldDeliverable->name . $nameFilter[$workflowGroup->id][$oldDeliverable->name];
$nameFilter[$workflowGroup->id][$oldDeliverable->name] ++;
}
else