From b115ed3b79a85f8d29e7549a5e3d56f86456eadd Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 16 Jun 2021 10:43:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9LDAP=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=BB=98=E8=AE=A4=E6=B7=BB=E5=8A=A0=E5=88=B0?= =?UTF-8?q?Default=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/settings/utils/ldap.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/settings/utils/ldap.py b/apps/settings/utils/ldap.py index e4264f0e6..72c3c4fdf 100644 --- a/apps/settings/utils/ldap.py +++ b/apps/settings/utils/ldap.py @@ -26,6 +26,7 @@ from common.const import LDAP_AD_ACCOUNT_DISABLE from common.utils import timeit, get_logger from users.utils import construct_user_email from users.models import User +from orgs.models import Organization from authentication.backends.ldap import LDAPAuthorizationBackend, LDAPUser logger = get_logger(__file__) @@ -364,12 +365,17 @@ class LDAPImportUtil(object): def perform_import(self, users): logger.info('Start perform import ldap users, count: {}'.format(len(users))) errors = [] + instances = [] for user in users: try: - self.update_or_create(user) + obj, created = self.update_or_create(user) + if created: + instances.append(user) except Exception as e: errors.append({user['username']: str(e)}) logger.error(e) + # 默认添加用户到 Default 组织 + Organization.default().members.add(*instances) logger.info('End perform import ldap users') return errors