Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu
This commit is contained in:
@@ -646,16 +646,16 @@ class gitlabModel extends model
|
||||
}
|
||||
|
||||
/**
|
||||
* Get account name in zentao sys.
|
||||
* Get account in zentaopms.
|
||||
*
|
||||
* @param int $gitlabID
|
||||
* @param int $userID
|
||||
* @access public
|
||||
* @return string|false
|
||||
*/
|
||||
public function getAccountName($gitlabID, $userID)
|
||||
public function getAccount($gitlabID, $userID)
|
||||
{
|
||||
return $this->dao->select("account")
|
||||
return $this->dao->select('account')
|
||||
->from(TABLE_OAUTH)
|
||||
->where('providerType')->eq('gitlab')
|
||||
->andwhere('providerID')->eq($gitlabID)
|
||||
|
||||
Reference in New Issue
Block a user