Skip to content

Commit

Permalink
fix get_data_from_db (#309)
Browse files Browse the repository at this point in the history
  • Loading branch information
likesclever authored Dec 12, 2023
1 parent e40e6f6 commit 3418986
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions ldap_syncer/ldap_user_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,16 @@ def get_data_from_db(self):
for user in ldap_users:
email_list.append(user[0])
users = list()
try:
self.ccnet_db_cursor.execute("SELECT e.id, e.email, ctime, is_staff, is_active, role, is_manual_set FROM "
"`EmailUser` e LEFT JOIN UserRole r ON e.email=r.email WHERE e.email IN %s",
[email_list])
res = self.ccnet_db_cursor.fetchall()
except Exception as e:
logger.error('get users from ccnet failed: %s' % e)
return user_data_db
res = list()
if email_list:
try:
self.ccnet_db_cursor.execute("SELECT e.id, e.email, ctime, is_staff, is_active, role, is_manual_set FROM "
"`EmailUser` e LEFT JOIN UserRole r ON e.email=r.email WHERE e.email IN %s",
[email_list])
res = self.ccnet_db_cursor.fetchall()
except Exception as e:
logger.error('get users from ccnet failed: %s' % e)
return user_data_db
for user in res:
users.append(UserObj(user[0], user[1], user[2], user[3], user[4], user[5], user[6]))

Expand Down

0 comments on commit 3418986

Please sign in to comment.