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

* Fix bug #16882, #16924.

Browse Source
This commit is contained in:
liumengyi
2021-12-01 11:25:02 +08:00
parent 86674338d9
commit bba0c40dfe
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6 -4
View File
@@ -1482,12 +1482,14 @@ class actionModel extends model
{
$dateGroup = array_reverse($dateGroup);
}
elseif($this->app->rawModule == 'company' and (($direction == 'next' and $orderBy == 'date_asc') or ($direction == 'pre' and $orderBy == 'date_desc')))
elseif($this->app->rawModule == 'company')
{
$dateGroup = array_reverse($dateGroup);
foreach($dateGroup as $key => $dateItem) $dateGroup[$key] = array_reverse($dateItem);
if($direction == 'pre') $dateGroup = array_reverse($dateGroup);
if(($direction == 'next' and $orderBy == 'date_asc') or ($direction == 'pre' and $orderBy == 'date_desc'))
{
foreach($dateGroup as $key => $dateItem) $dateGroup[$key] = array_reverse($dateItem);
}
}
return $dateGroup;
}