From a33a89aa2bbcc0d40eab2e858d1d330c64f665dc Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 21 Dec 2023 08:21:05 +0000 Subject: [PATCH] * Fix bind user notice error. --- module/gitlab/control.php | 2 +- module/gitlab/zen.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/gitlab/control.php b/module/gitlab/control.php index f106d866ff..a49427af25 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -167,7 +167,7 @@ class gitlab extends control $users = $this->post->zentaoUsers; $gitlabNames = $this->post->gitlabUserNames; - $result = $this->gitlabZen->checkUserRepeat($users); + $result = $this->gitlabZen->checkUserRepeat($users, $userPairs); if($result['result'] != 'success') return $this->send($result); $this->gitlabZen->bindUsers($gitlabID, $users, $gitlabNames, $zentaoUsers); diff --git a/module/gitlab/zen.php b/module/gitlab/zen.php index 8ad16afe13..101b081899 100644 --- a/module/gitlab/zen.php +++ b/module/gitlab/zen.php @@ -16,10 +16,11 @@ class gitlabZen extends gitlab * Check bind user repeat. * * @param array $zentaoUsers + * @param array $userPairs * @access protected * @return array */ - protected function checkUserRepeat(array $zentaoUsers): array + protected function checkUserRepeat(array $zentaoUsers, array $userPairs): array { $accountList = array(); $repeatUsers = array();