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

* [bug] fix sonar.

Browse Source
This commit is contained in:
qixinzhi
2024-08-14 14:02:15 +08:00
committed by 代婷婷
parent 862ccb01c8
commit 8f6ef17a6f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/control.php
+1 -1
View File
@@ -97,7 +97,7 @@ class pivot extends control
$pivot = $this->pivot->getByID($pivotID);
$pivotState = $this->pivotZen->initPivotState($pivot);
$cols = $this->pivot->getDrillCols($drill->object);
$datas = $value == 0 ? array() : $this->pivot->getDrillDatas($pivotState, $drill, $status, $mergeConditions, $filterValues);
$datas = $value == 0 ? array() : $this->pivot->getDrillDatas($pivotState, $drill, $mergeConditions, $filterValues);
if(strpos(',story,task,bug,', ",{$drill->object},") !== false) $datas = $this->pivot->processKanbanDatas($drill->object, $datas);
module/pivot/model.php
+1 -2
View File
@@ -2598,11 +2598,10 @@ class pivotModel extends model
* @param object $drill
* @param array $conditions
* @param array $filterValues
* @param string $status
* @access public
* @return array
*/
public function getDrillDatas(object $pivotState, object $drill, string $status, array $conditions, array $filterValues = array()): array
public function getDrillDatas(object $pivotState, object $drill, array $conditions, array $filterValues = array()): array
{
$filters = $pivotState->setFiltersDefaultValue($filterValues);
foreach($conditions as $index => $condition)