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

Merge branch 'sprint/217_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #25554.

See merge request easycorp/zentaopms!4636
This commit is contained in:
王怡栋
2022-07-22 05:22:16 +00:00
parent 22230645dd d83ed1092d
commit 780dc7399c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+4 -3
View File
@@ -1044,6 +1044,8 @@ class actionModel extends model
if($this->app->getMethodName() == 'dynamic') $beginDate = $year - 1 . '-01-01';
}
$programCondition = empty($this->app->user->view->programs) ? '0' : $this->app->user->view->programs;
/* Get actions. */
$actions = $this->dao->select('*')->from(TABLE_ACTION)
->where('objectType')->notIN('kanbanregion,kanbanlane,kanbancolumn')
@@ -1070,6 +1072,7 @@ class actionModel extends model
->beginIF($actionCondition)->andWhere("($actionCondition)")->fi()
/* Filter out client login/logout actions. */
->andWhere('action')->notin('disconnectxuanxuan,reconnectxuanxuan,loginxuanxuan,logoutxuanxuan')
->andWhere("IF((objectType = 'program'), (objectID in ($programCondition)), '1=1')")
->orderBy($orderBy)
->page($pager)
->fetchAll();
@@ -1094,12 +1097,10 @@ class actionModel extends model
{
if(empty($this->app->user->rights['acls']['actions'])) return '';
$canViewPrograms = empty($this->app->user->view->programs) ? '0' : $this->app->user->view->programs;
foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
{
if(isset($this->lang->mainNav->$moduleName) and !empty($this->app->user->rights['acls']['views']) and !isset($this->app->user->rights['acls']['views'][$moduleName])) continue;
$programQuery = $moduleName == 'program' ? "`objectID` in ($canViewPrograms) and " : '';
$actionCondition .= "($programQuery `objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
$actionCondition .= "(`objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
}
$actionCondition = trim($actionCondition, 'or ');
}