From de73d20d6828bd3bfc65864d9f651842dc182021 Mon Sep 17 00:00:00 2001
From: selfrelease <freedak.ipad@gmail.com>
Date: Fri, 31 Jul 2026 09:49:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E4=BB=B7=E5=80=BC?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8F=AA=E7=BB=9F=E8=AE=A1=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9A=84=E9=A3=8E=E9=99=A9=EF=BC=8C=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 员工离职时系统自动将PENDING风险标记为RESOLVED(resolvedBy=null)
- 这些风险并未被真正解决，不应计入规避损失
- 年度报告所有RESOLVED查询加 resolvedBy: { not: null } 条件
- 只有用户在待办中点击完成的才算真正规避
---
 backend/src/services/risk.service.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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: {