From 21a7e2bac1f59a04582dc4e3e2f125e61570ef85 Mon Sep 17 00:00:00 2001 From: mayue Date: Thu, 7 Apr 2022 16:50:03 +0800 Subject: [PATCH] * Fix bug #21579. --- module/productplan/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/productplan/model.php b/module/productplan/model.php index 3f492c6dd2..2e0ebb32f3 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -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)