From 57b2b405cf55a784fae6951f5904ec749fedfd56 Mon Sep 17 00:00:00 2001 From: WuYongJie Date: Tue, 6 Oct 2026 17:55:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(intake):=20=E5=95=86=E5=93=81=E4=BC=81?= =?UTF-8?q?=E5=88=92=E5=80=99=E9=80=89=E4=BA=BA=E6=8E=92=E9=99=A4=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intake-owner-options.service.test.ts | 24 +++++++++++++++++++ .../services/intake-owner-options.service.ts | 6 ++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/furniture-3d-system/src/server/services/__tests__/intake-owner-options.service.test.ts b/furniture-3d-system/src/server/services/__tests__/intake-owner-options.service.test.ts index ccafba64..2c444375 100644 --- a/furniture-3d-system/src/server/services/__tests__/intake-owner-options.service.test.ts +++ b/furniture-3d-system/src/server/services/__tests__/intake-owner-options.service.test.ts @@ -153,4 +153,28 @@ describe('intake-owner-options.service', () => { listIntakeOwnerOptionNamesByDepartmentScope('merchandisePlanning'), ).resolves.toEqual(['内部A']) }) + + it('excludes supplier accounts from merchandise planning candidates', async () => { + mockedFindMany.mockResolvedValue([ + { + name: '兰考华兰家具', + businessRoles: ['SUPPLIER'], + department: null, + team: null, + }, + { + name: '内部A', + businessRoles: [], + department: { + name: '产品研发部', + fullPath: '江苏简尚品牌管理有限公司 > 产品研发部', + }, + team: null, + }, + ]) + + await expect( + listIntakeOwnerOptionNamesByDepartmentScope('merchandisePlanning'), + ).resolves.toEqual(['内部A']) + }) }) diff --git a/furniture-3d-system/src/server/services/intake-owner-options.service.ts b/furniture-3d-system/src/server/services/intake-owner-options.service.ts index eb3974d6..37a1e7db 100644 --- a/furniture-3d-system/src/server/services/intake-owner-options.service.ts +++ b/furniture-3d-system/src/server/services/intake-owner-options.service.ts @@ -119,8 +119,12 @@ export async function listIntakeOwnerOptionNamesByDepartmentScope( if (isOptionExternalIntakeUser) return false; + // 供应商自注册账号(SUPPLIER 角色)不是内部人员, + // 不应出现在任何内部负责人候选里。 + if (user.businessRoles?.includes("SUPPLIER")) return false; + // 商品企划部已解散(2026-10 用户口径):商品企划不再按部门圈定候选人, - // 直接开放为全部内部人员可搜索填写;外部人员已在上面排除。 + // 直接开放为全部内部人员可搜索填写;外部人员与供应商已在上面排除。 if (scope === "merchandisePlanning") { return true; }