Merge branch 'mayue_fix_bug#21579' into 'master'

* Fix bug #21579. See merge request easycorp/zentaopms!2805
2022-04-07 08:55:02 +00:00
parent 6c1b31ac86 21a7e2bac1
commit 329312cde1
1 changed files with 1 additions and 1 deletions
@@ -83,7 +83,7 @@ class productplanModel extends model
        $date  = date('Y-m-d');
        $plans = $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('product')->eq($product)
            ->andWhere('deleted')->eq(0)
-            ->beginIF(!empty($branch))->andWhere('branch')->eq($branch)->fi()
+            ->beginIF(!empty($branch) and $branch != 'all')->andWhere('branch')->eq($branch)->fi()
            ->beginIF($browseType != 'all')->andWhere('status')->eq($browseType)->fi()
            ->beginIF(strpos($param, 'skipparent') !== false)->andWhere('parent')->ne(-1)->fi()
            ->orderBy($orderBy)