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

* adjust for updatewhitelist when increase.

Browse Source
This commit is contained in:
王怡栋
2021-08-09 17:04:12 +08:00
parent 8b1d769e67
commit f6904dc8ab
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/personnel/model.php
+14 -3
View File
@@ -473,6 +473,7 @@ class personnelModel extends model
->where('t1.objectID')->eq($objectID)
->andWhere('t1.type')->eq('whitelist')
->andWhere('t1.objectType')->eq($objectType)
->andWhere('t2.realname')->ne('')
->orderBy($orderBy)
->beginIF(!empty($pager))->page($pager)->fi()
->fetchAll();
@@ -488,7 +489,7 @@ class personnelModel extends model
*/
public function getWhitelistAccount($objectID = 0, $objectType = '')
{
return $this->dao->select('account')->from(TABLE_ACL)->where('objectID')->eq($objectID)->andWhere('objectType')->eq($objectType)->fetchPairs('account');
return $this->dao->select('account')->from(TABLE_ACL)->where('objectID')->eq($objectID)->andWhere('objectType')->eq($objectType)->fetchPairs('account', 'account');
}
/**
@@ -536,8 +537,18 @@ class personnelModel extends model
if($updateType == 'increase')
{
$oldWhitelist = $this->dao->select('whitelist')->from($objectTable)->where('id')->eq($objectID)->fetch('whitelist');
$oldWhitelist = explode(',', $oldWhitelist);
$accounts = array_unique(array_merge($accounts, $oldWhitelist));
$groups = $this->dao->select('id')->from(TABLE_GROUP)->where('id')->in($oldWhitelist)->fetchPairs('id', 'id');
if($groups)
{
$oldWhitelist = $this->dao->select('account')->from(TABLE_GROUPPRIV)->where('`group`')->in($groups)->fetchPairs('account', 'account');
if($oldWhitelist) $accounts = array_unique(array_merge($accounts, $oldWhitelist));
}
else
{
$oldWhitelist = $this->dao->select('account')->from(TABLE_USER)->where('account')->in($oldWhitelist)->fetchPairs('account', 'account');
if($oldWhitelist) $accounts = array_unique(array_merge($accounts, $oldWhitelist));
}
}
$whitelist = ',' . implode(',', $accounts);
$this->dao->update($objectTable)->set('whitelist')->eq($whitelist)->where('id')->eq($objectID)->exec();