优化：成员角色问题修复

src/pages/systemManage/companyManage/companyDetail/components/addPeopleModal/index.tsx

@@ -33,7 +33,8 @@ const AddPeopleModal: FC<ModalProps & selfProps> = ({
   const selectSearchEvent = (value: string) => {
     CommonAPI.getUserAccountByPhoneNum({ phoneNum: value }).then(({ result }) => {
       const list = (result || []).map((v) => ({
-        label: v.phoneNum + `(${v.uid})`,
+        label: `${v?.userName || v?.nickName || v?.uid}（${v?.phoneNum}）`,
+        // label: v.phoneNum + `(${v.uid})`,
         value: v.id,
         key: value,
       }));

src/pages/systemManage/companyManage/companyDetail/components/transferLeaderModal/index.tsx

-import { Form, message, Modal, ModalProps, Select } from 'antd';
-import { FC, useEffect, useState } from 'react';
+import { Form, message, Modal, ModalProps, Select, SelectProps } from 'antd';
+import React, { useEffect, useState } from 'react';
 import { SystemManageAPI } from '~/api';
 import { InterDataType } from '~/api/interface';
 import { listCompanyMembersType } from '~/api/interface/systemManageType';
 
 //单位-成员列表返回类型
 type companyMembersType = InterDataType<listCompanyMembersType>['list'];
-interface selfProps {
-  onOk: () => void;
-  companyInfoId: number;
-  currentCompanyMembers: companyMembersType[0] | undefined;
-}
-const TransferLeaderModal: FC<ModalProps & selfProps> = ({
-  open,
-  onOk,
-  onCancel,
-  companyInfoId,
-  currentCompanyMembers,
-}) => {
+const TransferLeaderModal: React.FC<
+  ModalProps & {
+    onOk: () => void;
+    onCancel: () => void;
+    companyInfoId: number;
+    currentCompanyMembers?: companyMembersType[0];
+  }
+> = ({ open, onOk, onCancel, companyInfoId, currentCompanyMembers }) => {
   const [form] = Form.useForm<{ toUserAccountId: number }>();
-  const [listCompanyMembers, setListCompanyMembers] = useState<companyMembersType>([]);
+  const [listCompanyMembers, setListCompanyMembers] = useState<SelectProps['options']>([]);
   const handleOk = () => {
     form.validateFields().then((values) => {
       if (currentCompanyMembers) {
@@ -43,7 +39,14 @@ const TransferLeaderModal: FC<ModalProps & selfProps> = ({
       pageNo: 1,
       pageSize: 999999,
     }).then(({ result }) => {
-      setListCompanyMembers((result.list || []).filter((v) => !v.leader));
+      setListCompanyMembers(
+        result?.list?.map((item) => ({
+          label: `${item?.userName || item?.nickName || item?.uid}（${item?.phoneNum}）`,
+          value: item.id,
+          key: item.id,
+          disabled: item.id === currentCompanyMembers?.id,
+        })),
+      );
     });
   };
   useEffect(() => {
@@ -60,13 +63,8 @@ const TransferLeaderModal: FC<ModalProps & selfProps> = ({
             filterOption={(input, option) =>
               (option!.children as unknown as string).toLowerCase().includes(input.toLowerCase())
             }
-          >
-            {listCompanyMembers.map((v) => (
-              <Select.Option key={v.id} value={v.id}>
-                {v.phoneNum}({v.uid})
-              </Select.Option>
-            ))}
-          </Select>
+            options={listCompanyMembers}
+          />
         </Form.Item>
       </Form>
     </Modal>