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

* Fix product and project select logic.

Browse Source
This commit is contained in:
sgm0422
2020-07-21 13:41:02 +08:00
parent 835b2bf717
commit a0a0f0b082
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+2 -2
View File
@@ -270,7 +270,7 @@ class productModel extends model
{
return $this->dao->select('*')->from(TABLE_PRODUCT)
->where('deleted')->eq(0)
->andWhere('program')->eq($this->session->program)
->beginIF($this->session->program)->andWhere('program')->eq($this->session->program)->fi()
->beginIF($line > 0)->andWhere('line')->eq($line)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
@@ -301,7 +301,7 @@ class productModel extends model
$products = $this->dao->select('*, IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
->from(TABLE_PRODUCT)
->where('deleted')->eq(0)
->andWhere('program')->eq($this->session->program)
->beginIF($this->session->program)->andWhere('program')->eq($this->session->program)->fi()
->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
->orderBy($orderBy)
module/project/model.php
+3 -3
View File
@@ -682,7 +682,7 @@ class projectModel extends model
/* Order by status's content whether or not done */
$projects = $this->dao->select('*, IF(INSTR(" done,closed", status) < 2, 0, 1) AS isDone')->from(TABLE_PROJECT)
->where('iscat')->eq(0)
->andWhere('program')->eq($this->session->program)
->beginIF($this->session->program)->andWhere('program')->eq($this->session->program)->fi()
->beginIF(strpos($mode, 'withdelete') === false)->andWhere('deleted')->eq(0)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->orderBy($orderBy)
@@ -737,7 +737,7 @@ class projectModel extends model
->where('t1.product')->eq($productID)
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.iscat')->eq(0)
->andWhere('t2.program')->eq($this->session->program)
->beginIF($this->session->program)->andWhere('t2.program')->eq($this->session->program)->fi()
->andWhere('t2.template')->eq('')
->beginIF($status == 'undone')->andWhere('t2.status')->notIN('done,closed')->fi()
->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
@@ -754,7 +754,7 @@ class projectModel extends model
->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->andWhere('deleted')->eq(0)
->andWhere('program')->eq($this->session->program)
->beginIF($this->session->program)->andWhere('program')->eq($this->session->program)->fi()
->andWhere('template')->eq('')
->orderBy('order_desc')
->beginIF($limit)->limit($limit)->fi()