From dee149d5408e6a923ff8878e5329bcc5af39941d Mon Sep 17 00:00:00 2001 From: sunguangming Date: Thu, 8 Jan 2026 03:35:15 +0000 Subject: [PATCH 1/2] * [bug#67331,done,0.2h] fix bug. --- module/project/zen.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/module/project/zen.php b/module/project/zen.php index ab7662f701..d53cc5f850 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -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); From e2e9aa57c0082957244a864bfd9b57b4a49b88c5 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Thu, 8 Jan 2026 03:40:58 +0000 Subject: [PATCH 2/2] * Modify unittest. --- module/project/test/zen/checkproductandbranch.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/project/test/zen/checkproductandbranch.php b/module/project/test/zen/checkproductandbranch.php index fc35d79f83..98eb578b8f 100755 --- a/module/project/test/zen/checkproductandbranch.php +++ b/module/project/test/zen/checkproductandbranch.php @@ -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'); \ No newline at end of file +r($projectzenTest->checkProductAndBranchTest($project, $rawdata)) && p() && e('1');