TangSengDaoDao/TangSengDaoDaoWeb
1
0
Fork 0
mirror of https://github.com/TangSengDaoDao/TangSengDaoDaoWeb synced 2025-06-05 00:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 🐛修复创建群聊，被邀请人的备注没有展示及不显黑名单成员

Browse Source
This commit is contained in:
wanglihui 2024-07-28 09:43:04 +08:00
parent 4095df1c51
commit ed20b1ac27
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -30,7 +30,7 @@
"rimraf": "^5.0.5", "rimraf": "^5.0.5",
"turbo": "2.0.9" "turbo": "2.0.9"
}, },
"packageManager": "yarn@4.3.1", "packageManager": "yarn@1.22.22",
"engines": { "engines": {
"node": ">=18.0.0", "node": ">=18.0.0",
"yarn": ">=1.22.19" "yarn": ">=1.22.19"

17
packages/tsdaodaocontacts/src/Organizational/GroupNew/index.tsx
View File

@ -14,6 +14,8 @@ import {
import { BasicTreeNodeData } from "@douyinfe/semi-foundation/lib/cjs/tree/foundation"; import { BasicTreeNodeData } from "@douyinfe/semi-foundation/lib/cjs/tree/foundation";
import { WKApp, ThemeMode, WKViewQueueHeader } from "@tsdaodao/base"; import { WKApp, ThemeMode, WKViewQueueHeader } from "@tsdaodao/base";
import WKAvatar from "@tsdaodao/base/src/Components/WKAvatar"; import WKAvatar from "@tsdaodao/base/src/Components/WKAvatar";
import { ContactsStatus } from "@tsdaodao/base/src/Service/DataSource/DataSource";
import "./index.css"; import "./index.css";
interface IPorpsOrganizationalGroupNew { interface IPorpsOrganizationalGroupNew {
@ -185,7 +187,8 @@ export class OrganizationalGroupNew extends Component<
} }
OTree.push({ OTree.push({
label: employeesNum > 0 ? `${item.name}(${employeesNum})` : `${item.name}`, label:
employeesNum > 0 ? `${item.name}(${employeesNum})` : `${item.name}`,
value: item.dept_id, value: item.dept_id,
key: item.short_no, key: item.short_no,
icon: ( icon: (
@ -291,12 +294,14 @@ export class OrganizationalGroupNew extends Component<
getFriendData() { getFriendData() {
const setFriendData: any[] = []; const setFriendData: any[] = [];
WKApp.dataSource.contactsList.map((item) => { WKApp.dataSource.contactsList
setFriendData.push({ .filter((c) => c.status !== ContactsStatus.Blacklist)
name: item.name, .map((item) => {
uid: item.uid, setFriendData.push({
name: item.remark || item.name,
uid: item.uid,
});
}); });
});
this.setState({ this.setState({
friendData: [...setFriendData], friendData: [...setFriendData],
friendSearchData: [...setFriendData], friendSearchData: [...setFriendData],