Merge branch 'master' into zentaopms_239

2022-09-30 09:07:53 +08:00
parent daa0ea847c 8e28c42e0f
commit d300ee00da
244 changed files with 6448 additions and 967 deletions
@@ -1982,6 +1982,17 @@ class userModel extends model
                $productIdList = zget($programProduct, $programStakeholder->objectID, array());
                foreach($productIdList as $productID) $stakeholderGroups[$productID][$programStakeholder->user] = $programStakeholder->user;
            }
+
+            $sql = $this->dao->select('id,PM')->from(TABLE_PROGRAM)
+                ->where('type')->eq('program')
+                ->andWhere('id')->in(array_keys($programProduct))
+                ->query();
+
+            while($programOwner = $sql->fetch())
+            {
+                $productIdList = zget($programProduct, $programOwner->id, array());
+                foreach($productIdList as $productID) $stakeholderGroups[$productID][$programOwner->PM] = $programOwner->PM;
+            }
        }

        return array($teamGroups, $stakeholderGroups);