From 9b5be02e4022c835153f312ebf744369952620dc Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 28 Jun 2024 13:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=96=B0=E5=A2=9E=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E7=99=BB=E8=AE=B0=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/BSSafeCheckController.cs       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
index 7fc3eaf..812a172 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
@@ -8138,9 +8138,9 @@ namespace APT.BS.WebApi.Controllers.Api
             IEnumerable<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategory = null;
             if (entity.SAFE_CHECK_ID != Guid.Empty)
             {
-                listCheakProject = GetEntities<T_BS_SAFE_CHECK_PROJECT>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
-                listCheakArea = GetEntities<T_BS_SAFE_CHECK_RISK_AREA>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
-                listCheakCategory = GetEntities<T_BS_SAFE_CHECK_PROJECT_CATEGORY>(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null);
+                listCheakProject = GetEntities<T_BS_SAFE_CHECK_PROJECT>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
+                listCheakArea = GetEntities<T_BS_SAFE_CHECK_RISK_AREA>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
+                listCheakCategory = GetEntities<T_BS_SAFE_CHECK_PROJECT_CATEGORY>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
             }
             return SafeExecute(() =>
             {
@@ -8203,8 +8203,6 @@ namespace APT.BS.WebApi.Controllers.Api
                 T_BS_CHECK_MAIN modelMain = null;
                 int NUM = 0;
 
-
-
                 T_BS_SAFE_CHECK_RISK_AREA cheakAreaAdd = null;
                 List<T_BS_SAFE_CHECK_PROJECT> listCheakProjectAdd = new List<T_BS_SAFE_CHECK_PROJECT>();
                 List<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategoryAdd = new List<T_BS_SAFE_CHECK_PROJECT_CATEGORY>();
@@ -8323,11 +8321,12 @@ namespace APT.BS.WebApi.Controllers.Api
 
                     //判断 完善 检查表 项目与项目分类信息
                     var checkProj = listCheakProject.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID);
+                    if (checkProj == null)
+                        checkProj = listCheakProjectAdd.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID);
                     if (checkProj == null)
                     {
                         listCheakProjectAdd.Add(new T_BS_SAFE_CHECK_PROJECT()
                         {
-
                             ID = Guid.NewGuid(),
                             ORG_ID = entity.ORG_ID,
                             CREATER_ID = loginId,
@@ -8338,11 +8337,12 @@ namespace APT.BS.WebApi.Controllers.Api
                         });
                     }
                     var checkCategory = listCheakCategory.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID);
+                    if (checkCategory == null)
+                        checkCategory = listCheakCategoryAdd.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID);
                     if (checkCategory == null)
                     {
                         listCheakCategoryAdd.Add(new T_BS_SAFE_CHECK_PROJECT_CATEGORY()
                         {
-
                             ID = Guid.NewGuid(),
                             ORG_ID = entity.ORG_ID,
                             CREATER_ID = loginId,