From 9c25d4b02039b820c7eb076201c066154fd10938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Mon, 10 Nov 2025 16:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=8F=8A=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E6=A3=80=E6=9F=A5=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=88=A4=E6=96=AD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs      | 2 +-
 .../Api/SecurityInspectionRecordSummaryController.cs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
index 41a409e..ef5e312 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
@@ -1468,7 +1468,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                         {
                             T_FM_TEAM team = new T_FM_TEAM();
                             team.NAME = item.NAME;
-                            team.CHARGE_PERSON_ID = item.USER_ID;
+                            team.CHARGE_PERSON_ID = users.FirstOrDefault(t=>t.ID == item.USER_ID)?.PERSON_ID;
                             team.DEPARTMENT_ID = item.ID;
                             team.ORG_ID = orgId;
                             teamInfos.Add(team);
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
index 2989c00..17cf4b2 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
@@ -66,7 +66,7 @@ namespace APT.SK.WebApi.Controllers.Api
                     var groupDetails = details.Where(m => m.CHECK_RESULT == SKCheckResultEnum.Yes && m.IS_DELETED == false).GroupBy(t => new { t.RISK_AREA_ID, t.CHECK_CONTENTS_ID, t.CHECK_QUESTION_ID }).ToList();
                     foreach (var group in groupDetails)
                     {
-                        var haveRecord = details.Where(t => t.RISK_AREA_ID == group.Key.RISK_AREA_ID && t.CHECK_CONTENTS_ID == group.Key.CHECK_CONTENTS_ID && t.CHECK_QUESTION_ID == group.Key.CHECK_QUESTION_ID).ToList();
+                        var haveRecord = details.Where(t => t.RISK_AREA_ID == group.Key.RISK_AREA_ID && t.CHECK_CONTENTS_ID == group.Key.CHECK_CONTENTS_ID && t.CHECK_QUESTION_ID == group.Key.CHECK_QUESTION_ID && t.IS_DELETED == false).ToList();
                         if (haveRecord.Count > 1)
                         {
                             throw new Exception("检查内容"+haveRecord.FirstOrDefault()?.Nav_Contents?.CHECKCONTENT+"有重复的隐患，请删除重复");