Merge branch 'devops20_caoyanyi' into 'devops20'

Devops20 caoyanyi See merge request easycorp/zentaopms!1560
2022-01-24 06:07:03 +00:00
parent a887a9edc3 e673ccf33f
commit ddc2cee664
6 changed files with 63 additions and 32 deletions
@@ -544,13 +544,15 @@ class gitlabModel extends model
     *
     * @param  int    $gitlabID
     * @param  int    $groupID
+     * @param  int    $userID
     * @access public
     * @return object
     */
-    public function apiGetGroupMembers($gitlabID, $groupID)
+    public function apiGetGroupMembers($gitlabID, $groupID, $userID = 0)
    {
        $apiRoot = $this->getApiRoot($gitlabID);
        $url     = sprintf($apiRoot, "/groups/$groupID/members/all");
+        if($userID) $url .= "&user_ids=$userID";

        $allResults = array();
        for($page = 1; true; $page++)