From 0a9058a585884f2f92aa9f3e51b8e7801f7fa853 Mon Sep 17 00:00:00 2001
From: Gucheng Wang <nomeguy@qq.com>
Date: Fri, 7 Oct 2022 15:43:50 +0800
Subject: [PATCH] Improve user list page

---
 web/src/App.js          | 6 ++++++
 web/src/UserListPage.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/src/App.js b/web/src/App.js
index 39244c57..30dfcc85 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -378,6 +378,9 @@ class App extends Component {
           </Link>
         </Menu.Item>
       );
+    }
+
+    if (Setting.isLocalAdminUser(this.state.account)) {
       res.push(
         <Menu.Item key="/users">
           <Link to="/users">
@@ -385,6 +388,9 @@ class App extends Component {
           </Link>
         </Menu.Item>
       );
+    }
+
+    if (Setting.isAdminUser(this.state.account)) {
       res.push(
         <Menu.Item key="/roles">
           <Link to="/roles">
diff --git a/web/src/UserListPage.js b/web/src/UserListPage.js
index fad819f8..25e9aacf 100644
--- a/web/src/UserListPage.js
+++ b/web/src/UserListPage.js
@@ -374,7 +374,7 @@ class UserListPage extends BaseListPage {
     const sortField = params.sortField, sortOrder = params.sortOrder;
     this.setState({loading: true});
     if (this.state.organizationName === undefined) {
-      UserBackend.getGlobalUsers(params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
+      Setting.isAdminUser(this.props.account) ? UserBackend.getGlobalUsers(params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder) : UserBackend.getUsers(this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
         .then((res) => {
           if (res.status === "ok") {
             this.setState({