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

* Fix bug.

Browse Source
This commit is contained in:
wangyuting2
2023-04-21 15:34:42 +08:00
parent 27df34722b
commit db1cf716f8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+8 -6
View File
@@ -62,8 +62,6 @@ class pivotModel extends model
public function getList($dimensionID = 0, $groupID = 0, $orderBy = 'id_desc', $pager = null)
{
$this->loadModel('screen');
$pivots = array();
if($groupID)
{
$groups = $this->dao->select('id')->from(TABLE_MODULE)
@@ -79,35 +77,39 @@ class pivotModel extends model
}
$conditions = trim($conditions, 'or');
$pivots += $this->dao->select('*')->from(TABLE_PIVOT)
$pivots = $this->dao->select('*')->from(TABLE_PIVOT)
->where('deleted')->eq(0)
->beginIF($conditions)->andWhere("({$conditions})")->fi()
->beginIF(!empty($dimensionID))->andWhere('dimension')->eq($dimensionID)->fi()
->orderBy($orderBy)
->fetchAll();
$pivots += $this->dao->select('*')->from(TABLE_CHART)
$charts = $this->dao->select('*')->from(TABLE_CHART)
->where('deleted')->eq(0)
->andWhere('type')->eq('table')
->beginIF($conditions)->andWhere("({$conditions})")->fi()
->beginIF(!empty($dimensionID))->andWhere('dimension')->eq($dimensionID)->fi()
->orderBy($orderBy)
->fetchAll();
$pivots = array_merge($pivots, $charts);
}
else
{
$pivots += $this->dao->select('*')->from(TABLE_PIVOT)
$pivots = $this->dao->select('*')->from(TABLE_PIVOT)
->where('deleted')->eq(0)
->beginIF(!empty($dimensionID))->andWhere('dimension')->eq($dimensionID)->fi()
->orderBy($orderBy)
->fetchAll();
$pivots += $this->dao->select('*')->from(TABLE_CHART)
$charts = $this->dao->select('*')->from(TABLE_CHART)
->where('deleted')->eq(0)
->andWhere('type')->eq('table')
->beginIF(!empty($dimensionID))->andWhere('dimension')->eq($dimensionID)->fi()
->orderBy($orderBy)
->fetchAll();
$pivots = array_merge($pivots, $charts);
}
$pager->setRecTotal(count($pivots));