From b0f797b5caf8b878a0516a578a35ae08339fc96c Mon Sep 17 00:00:00 2001
From: awenes <1121353141@qq.com>
Date: Thu, 5 Oct 2023 09:48:23 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/UserList/components/User/User.tsx | 73 +++++++++----------
 .../main/console-fe/src/services/account.ts   |  4 +-
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
index 9cb97262..40fc64a8 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
@@ -40,7 +40,7 @@ import {
   Tooltip,
   Typography,
   Tag,
-  Popover
+  Popover,
 } from 'antd';
 import React, { useRef, useState } from 'react';
 import CreateUser from '../CreateUser';
@@ -185,43 +185,42 @@ export default (props: UserListProps) => {
       search: false,
       ellipsis: true,
       render: (_, record) => [
-          <Popover
-              key="pop"
-              title={
-                  <Tag color={'geekblue'} key={record.primaryOrgDisplayPath}>
-                      {record.primaryOrgDisplayPath}
+        <Popover
+          key="pop"
+          title={
+            <Tag color={'geekblue'} key={record.orgDisplayPath}>
+              {record.primaryOrgDisplayPath}
+            </Tag>
+          }
+          content={
+            <Space direction="vertical" size="small" style={{ display: 'flex' }}>
+              {record.orgDisplayPath.split(',')?.map((p: string) => {
+                return (
+                  <Tag color={'green'} key={p}>
+                    {p}
                   </Tag>
-              }
-              content={
-                  <Space direction="vertical" size="small" style={{ display: 'flex' }}>
-                      {record.orgDisplayPath.split(",")?.map((p: string) => {
-                          return (
-                              <Tag color={'green'} key={p}>
-                                  {p}
-                              </Tag>
-                          )
-                      })}
-                  </Space>
-              }>
-              <Space key="primary_path">
-                  {
-                      <Tag color={'geekblue'} key={record.primaryOrgDisplayPath}>
-                          {record.primaryOrgDisplayPath}
-                      </Tag>
-                  }
-              </Space>
-              <Space key="path" direction="vertical" size="small" style={{ display: 'flex' }}>
-                  {
-                      record.orgDisplayPath.split(",")?.map((p: string) => {
-                          return (
-                              <Tag color={'green'} key={p}>
-                                  {p}
-                              </Tag>
-                          )
-                      })
-                  }
-              </Space>
-          </Popover>
+                );
+              })}
+            </Space>
+          }
+        >
+          <Space key="primary_path">
+            {
+              <Tag color={'geekblue'} key={record.primaryOrgDisplayPath}>
+                {record.primaryOrgDisplayPath}
+              </Tag>
+            }
+          </Space>
+          <Space key="path" direction="vertical" size="small" style={{ display: 'flex' }}>
+            {record.orgDisplayPath.split(',')?.map((p: string) => {
+              return (
+                <Tag color={'green'} key={p}>
+                  {p}
+                </Tag>
+              );
+            })}
+          </Space>
+        </Popover>,
       ],
     },
     {
diff --git a/eiam-console/src/main/console-fe/src/services/account.ts b/eiam-console/src/main/console-fe/src/services/account.ts
index e2c4e8eb..19626d12 100644
--- a/eiam-console/src/main/console-fe/src/services/account.ts
+++ b/eiam-console/src/main/console-fe/src/services/account.ts
@@ -273,7 +273,9 @@ export async function removeUser(id: string): Promise<API.ApiResult<boolean>> {
 /**
  * Remove  Batch User
  */
-export async function removeBatchUser(ids: (number | string)[]): Promise<API.ApiResult<boolean>> {
+export async function removeBatchUser(
+  ids: (number | string | Key)[],
+): Promise<API.ApiResult<boolean>> {
   return request<API.ApiResult<boolean>>(`/api/v1/user/batch_delete`, {
     method: 'DELETE',
     params: { ids: ids },