Merge branch 'master' of https://git.zcorp.cc/zentaopms

2020-12-25 14:17:30 +08:00
parent bdc4f0e2f6 bbf30a2e88
commit 314eedb28c
21 changed files with 96 additions and 41 deletions
@@ -449,7 +449,7 @@ class programModel extends model
     */
    public function getStakeholders($programID = 0, $orderBy, $pager = null)
    {
-        return $this->dao->select('t2.account,t2.realname,t2.role,t2.qq,t2.mobile,t2.phone,t2.weixin,t2.email,t1.id')->from(TABLE_STAKEHOLDER)->alias('t1')
+        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.key')->from(TABLE_STAKEHOLDER)->alias('t1')
            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
            ->where('t1.objectID')->eq($programID)
            ->andWhere('t1.objectType')->eq('program')