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

Merge branch 'devops18'

Browse Source
This commit is contained in:
liyuchun
2021-12-31 10:38:04 +08:00
parent 348eefb925 45053fc8ca
commit c2da5eefe2
58 changed files with 1243 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/program/model.php
View File

@@ -170,7 +170,7 @@ class programModel extends model
->fetchGroup('program');
$productPairs = array();
foreach($productGroup as $programID => $products)
foreach($productGroup as $programID => $products)
{
foreach($products as $product) $productPairs[$product->id] = $product->id;
}
@@ -496,7 +496,7 @@ class programModel extends model
* @access public
* @return array
*/
public function getStakeholders($programID = 0, $orderBy = '', $pager = null)
public function getStakeholders($programID = 0, $orderBy = 'id_desc', $pager = null)
{
return $this->dao->select('t2.account,t2.realname,t2.role,t2.qq,t2.mobile,t2.phone,t2.weixin,t2.email,t1.id,t1.type,t1.from,t1.key')->from(TABLE_STAKEHOLDER)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')