From 39f749918ea2741d04ec5c220ae717aa031f70a8 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Thu, 8 Dec 2022 10:26:17 +0800
Subject: [PATCH] fix(admin/users): Make table columns more compatible with
 filter conditions

---
 ui/src/pages/Admin/Users/index.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsx
index b425f49e..7cdc3e06 100644
--- a/ui/src/pages/Admin/Users/index.tsx
+++ b/ui/src/pages/Admin/Users/index.tsx
@@ -130,7 +130,9 @@ const Users: FC = () => {
             )}
 
             <th style={{ width: '12%' }}>{t('status')}</th>
-            <th style={{ width: '12%' }}>{t('role')}</th>
+            {curFilter !== 'suspended' && curFilter !== 'deleted' && (
+              <th style={{ width: '12%' }}>{t('role')}</th>
+            )}
             {curFilter !== 'deleted' ? (
               <th style={{ width: '8%' }} className="text-end">
                 {t('action')}
@@ -172,11 +174,13 @@ const Users: FC = () => {
                     {t(user.status)}
                   </span>
                 </td>
-                <td>
-                  <span className="badge text-bg-light">
-                    {t(user.role_name)}
-                  </span>
-                </td>
+                {curFilter !== 'suspended' && curFilter !== 'deleted' && (
+                  <td>
+                    <span className="badge text-bg-light">
+                      {t(user.role_name)}
+                    </span>
+                  </td>
+                )}
                 {curFilter !== 'deleted' ? (
                   <td className="text-end">
                     <Dropdown>