Multi-environment and multi-user construction

apps/api/src/activities/activities-excel.service.ts

@@ -272,7 +272,10 @@ export class ActivitiesExcelService {
     const n = name?.trim();
     if (!n) return null;
     const row = await this.prisma.user.findFirst({
-      where: { organizationId, fullName: { contains: n, mode: 'insensitive' } },
+      where: {
+        fullName: { contains: n, mode: 'insensitive' },
+        memberships: { some: { organizationId } },
+      },
       select: { id: true },
     });
     return row?.id ?? null;

apps/api/src/activities/activities.service.ts

@@ -420,7 +420,7 @@ export class ActivitiesService {
 
   private async assertUserInOrg(organizationId: string, userId: string) {
     const user = await this.prisma.user.findFirst({
-      where: { id: userId, organizationId },
+      where: { id: userId, memberships: { some: { organizationId } } },
       select: { id: true },
     });
     if (!user) throw new BadRequestException('مسئول انتخاب‌شده معتبر نیست');