Merge branch 'main' into dev_match

apps/backend/src/services/worker-platform/worker-platform-service.test.ts

@@ -1968,15 +1968,22 @@ test('好友赠送待打手提交资料筛选排除待抢单订单', () => {
   assert.match(whereClause, /wo\.status IN \('in_progress', 'problem'\)/)
 })
 
-test('工单筛选支持内部寄售匹配与打手好友赠送隔离，且赠送冷却中排除已验收已取消工单', () => {
+test('工单筛选支持内部寄售来源叠加人员条件，并保持好友赠送与冷却筛选', () => {
   const internalQuery = buildWorkOrderWhere({ acceptanceMode: 'internal_consignment' })
   assert.match(
     internalQuery.whereClause,
     /wo\.material_json->'consignment'->>'inventoryId' IS NOT NULL/,
   )
+  assert.doesNotMatch(internalQuery.whereClause, /wo\.assigned_worker_id IS NULL/)
+
+  const workerScopedInternalQuery = buildWorkOrderWhere({
+    acceptanceMode: 'internal_consignment',
+    workerSharingId: 25,
+  })
+  assert.match(workerScopedInternalQuery.joins, /worker_visible\.work_order_id = wo\.id/)
   assert.match(
-    internalQuery.whereClause,
-    /wo\.assigned_worker_id IS NULL OR wo\.assigned_worker_id = 0/,
+    workerScopedInternalQuery.whereClause,
+    /wo\.material_json->'consignment'->>'inventoryId' IS NOT NULL/,
   )
 
   const friendGiftQuery = buildWorkOrderWhere({ acceptanceMode: 'friend_gift' })