From 9d56e63ce0964e7a012f8c04f14d29121f8f1c58 Mon Sep 17 00:00:00 2001 From: 17792275749 <812100002@qq.com> Date: Tue, 15 Sep 2026 15:08:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(userManagement):=20=E8=A1=A5=E4=BC=A0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=20relationType=20=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E5=90=8E=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=A9=BA=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 一键添加本人传 relationType=1,其他添加新增传 relationType=2 - _clearAndSync 待下发列表为空时跳过 syncMembersToDevice,避免空列表 reject Co-Authored-By: Claude Code --- miniprogram/pages/addUser/addUser.ts | 1 + miniprogram/pages/userManagement/userManagement.ts | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/miniprogram/pages/addUser/addUser.ts b/miniprogram/pages/addUser/addUser.ts index 3bf853d..8495dd5 100644 --- a/miniprogram/pages/addUser/addUser.ts +++ b/miniprogram/pages/addUser/addUser.ts @@ -420,6 +420,7 @@ Page({ const payload: Record = { ...baseSpread, + ...(editId ? {} : { relationType: 2 }), dataType: userType === 'family' ? 1 : 0, parentUserId: userInfo?.userId ?? '', sn: targetSn, diff --git a/miniprogram/pages/userManagement/userManagement.ts b/miniprogram/pages/userManagement/userManagement.ts index 9d3c7fb..68c4bd1 100644 --- a/miniprogram/pages/userManagement/userManagement.ts +++ b/miniprogram/pages/userManagement/userManagement.ts @@ -391,12 +391,15 @@ Page({ this.setData({ syncShow: true, syncPercent: 0, syncStatus: '正在清空并重新下发...' }) leFuService.clearDeviceMembers() - .then(() => leFuService.syncMembersToDevice(syncDataList, (current, total) => { - this.setData({ - syncPercent: Math.round((current / total) * 100), - syncStatus: `正在同步 ${current}/${total}...`, + .then(() => { + if (!syncDataList.length) return + return leFuService.syncMembersToDevice(syncDataList, (current, total) => { + this.setData({ + syncPercent: Math.round((current / total) * 100), + syncStatus: `正在同步 ${current}/${total}...`, + }) }) - })) + }) .then(() => this._finishSync(reportUsers, '重新下发成功')) .catch((err: Error) => { this.setData({ syncShow: false }) @@ -485,6 +488,7 @@ Page({ if (!sn) return addSelfUser({ + relationType: 1, dataType: 0, parentUserId: userInfo.userId, sn,