From 955e73ddd1061751c18d7faced269e7cedd94bc4 Mon Sep 17 00:00:00 2001
From: IsAurora6 <85173010+IsAurora6@users.noreply.github.com>
Date: Sun, 17 Aug 2025 14:59:49 +0800
Subject: [PATCH] feat: fix the asynchronous issue in handleOrganizationChange
 in BaseListPage (#4090)

---
 web/src/BaseListPage.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/src/BaseListPage.js b/web/src/BaseListPage.js
index ecc19394..962f8292 100644
--- a/web/src/BaseListPage.js
+++ b/web/src/BaseListPage.js
@@ -42,10 +42,11 @@ class BaseListPage extends React.Component {
   handleOrganizationChange = () => {
     this.setState({
       organizationName: this.props.match?.params.organizationName || Setting.getRequestOrganization(this.props.account),
+    },
+    () => {
+      const {pagination} = this.state;
+      this.fetch({pagination});
     });
-
-    const {pagination} = this.state;
-    this.fetch({pagination});
   };
 
   handleTourChange = () => {