From e80a0e41ba7a808678173a4d82f87b24fcb21d47 Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Tue, 2 Jan 2024 14:42:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5LDAP=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=94=A8=E6=88=B7=E7=BB=84=E5=8F=AA=E7=A7=BB?= =?UTF-8?q?=E9=99=A4LDAP=E5=90=8C=E6=AD=A5=E8=BF=87=E6=9D=A5=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/settings/utils/ldap.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/settings/utils/ldap.py b/apps/settings/utils/ldap.py index 23b7b3882..b4f21affa 100644 --- a/apps/settings/utils/ldap.py +++ b/apps/settings/utils/ldap.py @@ -423,12 +423,11 @@ class LDAPImportUtil(object): logger.info('End perform import ldap users') return errors - @staticmethod - def exit_user_group(user_groups_mapper): + def exit_user_group(self, user_groups_mapper): # 通过对比查询本次导入用户需要移除的用户组 group_remove_users_mapper = defaultdict(set) for user, current_groups in user_groups_mapper.items(): - old_groups = set(user.groups.all()) + old_groups = set(user.groups.filter(name__startswith=self.user_group_name_prefix)) exit_groups = old_groups - current_groups logger.debug(f'Ldap user {user} exits user groups {exit_groups}') for g in exit_groups: