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

Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239'

Browse Source 
* Finish task #70760.

See merge request easycorp/zentaopms!5548
This commit is contained in:
刘刚
2022-09-27 03:06:30 +00:00
parent fe8357d0a6 571fdb40f8
commit bdb3d60f1d
2 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/model.php
+28 -9
View File
@@ -250,6 +250,7 @@ class groupModel extends model
$productList = $this->dao->select('id, name, program')->from(TABLE_PRODUCT)
->where('vision')->eq($this->config->vision)
->andWhere('deleted')->eq(0)
->andWhere('shadow')->eq(0)
->fetchAll('id');
/* Get the list of program sets under administrator permission. */
@@ -573,18 +574,36 @@ class groupModel extends model
$allUsers = $this->dao->select('account')->from(TABLE_PROJECTADMIN)->fetchPairs();
$this->dao->delete()->from(TABLE_PROJECTADMIN)->exec();
$members = $this->post->members ? $this->post->members : array();
$programs = $this->post->program ? $this->post->program : array();
$projects = $this->post->project ? $this->post->project : array();
$products = $this->post->product ? $this->post->product : array();
$executions = $this->post->execution ? $this->post->execution : array();
$programAll = $this->post->programAll ? $this->post->programAll : '';
$projectAll = $this->post->projectAll ? $this->post->projectAll : '';
$productAll = $this->post->productAll ? $this->post->productAll : '';
$executionAll = $this->post->executionAll ? $this->post->executionAll : '';
$members = $this->post->members ? $this->post->members : array();
$programs = $this->post->program ? $this->post->program : array();
$projects = $this->post->project ? $this->post->project : array();
$products = $this->post->product ? $this->post->product : array();
$executions = $this->post->execution ? $this->post->execution : array();
$programAll = $this->post->programAll ? $this->post->programAll : '';
$projectAll = $this->post->projectAll ? $this->post->projectAll : '';
$productAll = $this->post->productAll ? $this->post->productAll : '';
$executionAll = $this->post->executionAll ? $this->post->executionAll : '';
$noProductList = $this->loadModel('project')->getNoProductList();
$shadowProductIDList = $this->dao->select('id')->from(TABLE_PRODUCT)->where('shadow')->eq(1)->fetchPairs();
foreach($members as $lineID => $accounts)
{
$programs[$lineID] = isset($programs[$lineID]) ? $programs[$lineID] : array();
$projects[$lineID] = isset($projects[$lineID]) ? $projects[$lineID] : array();
$products[$lineID] = isset($products[$lineID]) ? $products[$lineID] : array();
$executions[$lineID] = isset($executions[$lineID]) ? $executions[$lineID] : array();
if($projects[$lineID] or $executions[$lineID])
{
$objects = array_merge($projects[$lineID], $executions[$lineID]);
foreach($objects as $objectID)
{
if(isset($noProductList[$objectID])) $products[$lineID][] = $noProductList[$objectID]->product;
}
}
if($executionAll[$lineID] or $projectAll[$lineID]) $products[$lineID] = array_merge($products[$lineID], $shadowProductIDList);
if(empty($accounts)) continue;
foreach($accounts as $account)
{
module/project/model.php
+15
View File
@@ -873,6 +873,21 @@ class projectModel extends model
->fetchGroup('productID', 'branchID');
}
/**
* Get No product project|execution List.
*
* @access public
* @return array
*/
public function getNoProductList()
{
return $this->dao->select('t1.product, t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t2.hasProduct')->eq(0)
->andWhere('t2.deleted')->eq(0)
->fetchAll('id');
}
/**
* Process the project privs according to the project model.
*