Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon

2021-12-01 13:47:11 +08:00
parent b91bd45f85 deb6809979
commit 9deab6a19a
6 changed files with 13 additions and 7 deletions
@@ -2168,6 +2168,8 @@ class gitlabModel extends model
        {
            $this->loadModel('action')->create('gitlabuser', $reponse->id, 'edited', '', $reponse->name);

+            /* Delete old bind. */
+            $this->dao->delete()->from(TABLE_OAUTH)->where('providerType')->eq('gitlab')->andWhere('providerID')->eq($gitlabID)->andWhere('openID')->eq($reponse->id)->andWhere('account')->ne($user->account)->exec();
            /* Bind user. */
            if($user->account && $changeBind)
            {