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

Merge branch release/22.0.beta of zentao/zentaopms (#13210)

Browse Source
This commit is contained in:
刘刚
2026-01-08 13:12:46 +08:00
committed by Gitfox
parent 81c83fb051 e2e9aa57c0
commit 3f199efadc
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/test/zen/checkproductandbranch.php
+2 -2
View File
@@ -69,7 +69,7 @@ $rawdata = new stdClass();
$rawdata->products = array();
$rawdata->branch = array();
$rawdata->addProduct = '';
r($projectzenTest->checkProductAndBranchTest($project, $rawdata)) && p('products[0]') && e('最少关联一个产品');
r($projectzenTest->checkProductAndBranchTest($project, $rawdata)) && p('products[0]') && e('1');
// 步骤3:多分支产品分支为空 - 应该返回分支为空错误
$project = new stdClass();
@@ -119,4 +119,4 @@ $rawdata = new stdClass();
$rawdata->products = array();
$rawdata->branch = array();
$rawdata->addProduct = '';
r($projectzenTest->checkProductAndBranchTest($project, $rawdata)) && p() && e('1');
r($projectzenTest->checkProductAndBranchTest($project, $rawdata)) && p() && e('1');
module/project/zen.php
-7
View File
@@ -140,13 +140,6 @@ class projectZen extends project
*/
private function checkProductAndBranch(object $project, object $rawdata): bool
{
$linkedProductsCount = $this->project->getLinkedProductsCount($project, $rawdata);
if($project->hasProduct && !empty($project->parent) && empty($linkedProductsCount) && empty($rawdata->addProduct))
{
dao::$errors['products[0]'] = $this->lang->project->errorNoProducts;
return false;
}
if(!empty($rawdata->products))
{
$topProgramID = (int)$this->loadModel('program')->getTopByID((int)$project->parent);