Fix prior archive filter collisions

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-10-17 17:49:51 +03:30
co-authored by Cursor
parent e86841fc60
commit bc68582fe2
6 changed files with 76 additions and 39 deletions
@@ -113,8 +113,10 @@ export class DealsExcelService {
this.prisma.deal.findMany({
where: {
organizationId: actor.organizationId,
...dealAccessWhere(actor),
...dealPriorWhere(actor.priorLens, actor.priorCutoff),
AND: [
dealAccessWhere(actor),
dealPriorWhere(actor.priorLens, actor.priorCutoff),
],
},
include: {
person: {
+4 -2
View File
@@ -328,8 +328,10 @@ export class PipelinesService {
where: {
organizationId,
pipelineId: resolved.id,
...(actor ? dealAccessWhere(actor) : {}),
...(includePrior ? {} : dealPriorWhere(actor?.priorLens, actor?.priorCutoff)),
AND: [
...(actor ? [dealAccessWhere(actor)] : []),
...(includePrior ? [] : [dealPriorWhere(actor?.priorLens, actor?.priorCutoff)]),
],
},
include: {
person: { select: { id: true, firstName: true, lastName: true } },