diff --git a/backend/src/services/risk.service.ts b/backend/src/services/risk.service.ts index a526f55..2d7d56f 100644 --- a/backend/src/services/risk.service.ts +++ b/backend/src/services/risk.service.ts @@ -1557,12 +1557,14 @@ export async function getAnnualValueReport(orgId: string, year: number) { prisma.riskItem.count({ where: { orgId, status: 'RESOLVED', + resolvedBy: { not: null }, resolvedAt: { gte: yearStart, lte: yearEnd }, }, }), prisma.riskItem.aggregate({ where: { orgId, status: 'RESOLVED', estimatedLoss: { gt: 0 }, + resolvedBy: { not: null }, resolvedAt: { gte: yearStart, lte: yearEnd }, }, _sum: { estimatedLoss: true }, @@ -1615,10 +1617,11 @@ export async function getAnnualValueReport(orgId: string, year: number) { }).then((count) => ({ month: m + 1, count })), ), ), - // 按员工维度的已解决风险明细 + // 按员工维度的人工解决风险明细(排除系统自动关闭的,只算用户真正处理过的) prisma.riskItem.findMany({ where: { orgId, status: 'RESOLVED', + resolvedBy: { not: null }, resolvedAt: { gte: yearStart, lte: yearEnd }, }, include: {