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 listCheakCategory = null; if (entity.SAFE_CHECK_ID != Guid.Empty) { - listCheakProject = GetEntities(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null); - listCheakArea = GetEntities(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null); - listCheakCategory = GetEntities(e => e.SAFE_CHECK_ID == entity.CHECK_TYPE_ID, null, null); + listCheakProject = GetEntities(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null); + listCheakArea = GetEntities(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null); + listCheakCategory = GetEntities(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 listCheakProjectAdd = new List(); List listCheakCategoryAdd = new List(); @@ -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,