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],