From 2062778ab8bb7d9feeed040e77f5952195a295aa Mon Sep 17 00:00:00 2001
From: wangruidong <940853815@qq.com>
Date: Tue, 6 Feb 2024 11:33:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B5=84=E4=BA=A7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=9C=AA=E5=8F=91=E9=80=81=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/acls/notifications.py                  | 10 +++++-----
 apps/authentication/api/connection_token.py |  2 +-
 apps/perms/utils/user_perm_tree.py          |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/acls/notifications.py b/apps/acls/notifications.py
index dc4db25ac..b0e413590 100644
--- a/apps/acls/notifications.py
+++ b/apps/acls/notifications.py
@@ -41,21 +41,21 @@ class UserLoginReminderMsg(UserMessage):
 class AssetLoginReminderMsg(UserMessage):
     subject = _('Asset login reminder')
 
-    def __init__(self, user, asset: Asset, login_user: User, account_username):
+    def __init__(self, user, asset: Asset, login_user: User, account: Account, input_username):
         self.asset = asset
         self.login_user = login_user
-        self.account_username = account_username
+        self.account = account
+        self.input_username = input_username
         super().__init__(user)
 
     def get_html_msg(self) -> dict:
-        account = Account.objects.get(asset=self.asset, username=self.account_username)
         context = {
             'recipient': self.user,
             'username': self.login_user.username,
             'name': self.login_user.name,
             'asset': str(self.asset),
-            'account': self.account_username,
-            'account_name': account.name,
+            'account': self.input_username,
+            'account_name': self.account.name,
         }
         message = render_to_string('acls/asset_login_reminder.html', context)
 
diff --git a/apps/authentication/api/connection_token.py b/apps/authentication/api/connection_token.py
index b5bafac32..f76b6e037 100644
--- a/apps/authentication/api/connection_token.py
+++ b/apps/authentication/api/connection_token.py
@@ -443,7 +443,7 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
             self._record_operate_log(acl, asset)
             for reviewer in reviewers:
                 AssetLoginReminderMsg(
-                    reviewer, asset, user, self.input_username
+                    reviewer, asset, user, account, self.input_username
                 ).publish_async()
 
     def create(self, request, *args, **kwargs):
diff --git a/apps/perms/utils/user_perm_tree.py b/apps/perms/utils/user_perm_tree.py
index 17248adc0..01090176e 100644
--- a/apps/perms/utils/user_perm_tree.py
+++ b/apps/perms/utils/user_perm_tree.py
@@ -194,6 +194,7 @@ class UserPermTreeExpireUtil(_UserPermTreeCacheMixin):
 
     @on_transaction_commit
     def expire_perm_tree_for_users_orgs(self, user_ids, org_ids):
+        user_ids = list(user_ids)
         org_ids = [str(oid) for oid in org_ids]
         with self.client.pipeline() as p:
             for uid in user_ids: