From ed20b1ac27fb8318c7864d1c5d2d21c36500cfb2 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 28 Jul 2024 09:43:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=BE=A4=E8=81=8A=EF=BC=8C=E8=A2=AB=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84=E5=A4=87=E6=B3=A8=E6=B2=A1=E6=9C=89=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=8A=E4=B8=8D=E6=98=BE=E9=BB=91=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                    |  2 +-
 .../src/Organizational/GroupNew/index.tsx       | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e867e4c..896a2f5 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "rimraf": "^5.0.5",
     "turbo": "2.0.9"
   },
-  "packageManager": "yarn@4.3.1",
+  "packageManager": "yarn@1.22.22",
   "engines": {
     "node": ">=18.0.0",
     "yarn": ">=1.22.19"
diff --git a/packages/tsdaodaocontacts/src/Organizational/GroupNew/index.tsx b/packages/tsdaodaocontacts/src/Organizational/GroupNew/index.tsx
index c457df0..aa8db87 100644
--- a/packages/tsdaodaocontacts/src/Organizational/GroupNew/index.tsx
+++ b/packages/tsdaodaocontacts/src/Organizational/GroupNew/index.tsx
@@ -14,6 +14,8 @@ import {
 import { BasicTreeNodeData } from "@douyinfe/semi-foundation/lib/cjs/tree/foundation";
 import { WKApp, ThemeMode, WKViewQueueHeader } from "@tsdaodao/base";
 import WKAvatar from "@tsdaodao/base/src/Components/WKAvatar";
+import { ContactsStatus } from "@tsdaodao/base/src/Service/DataSource/DataSource";
+
 import "./index.css";
 
 interface IPorpsOrganizationalGroupNew {
@@ -185,7 +187,8 @@ export class OrganizationalGroupNew extends Component<
       }
 
       OTree.push({
-        label: employeesNum > 0 ? `${item.name}(${employeesNum})` : `${item.name}`,
+        label:
+          employeesNum > 0 ? `${item.name}(${employeesNum})` : `${item.name}`,
         value: item.dept_id,
         key: item.short_no,
         icon: (
@@ -291,12 +294,14 @@ export class OrganizationalGroupNew extends Component<
 
   getFriendData() {
     const setFriendData: any[] = [];
-    WKApp.dataSource.contactsList.map((item) => {
-      setFriendData.push({
-        name: item.name,
-        uid: item.uid,
+    WKApp.dataSource.contactsList
+      .filter((c) => c.status !== ContactsStatus.Blacklist)
+      .map((item) => {
+        setFriendData.push({
+          name: item.remark || item.name,
+          uid: item.uid,
+        });
       });
-    });
     this.setState({
       friendData: [...setFriendData],
       friendSearchData: [...setFriendData],