From a2399db9bde4e1c0d5e2e222eafb1efbe9ce3d71 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 9 Oct 2024 09:00:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs index 398750f..35a0d33 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs @@ -259,7 +259,7 @@ namespace APT.BS.WebApi.Controllers.Api //wyw1114-1 && e.DEPARTMENT_ID.HasValue //&& e.CHECK_PROJECT_ID.HasValue && e.CHECK_PROJECT_CATEGORY_ID.HasValue wyw 2023-05-15 - Expression> expression = e => !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.CHECK_QUESTION_ID.HasValue && e.CHECK_TYPE_ID.HasValue && e.CHECK_PROJECT_ID.HasValue && e.CHECK_PROJECT_CATEGORY_ID.HasValue && e.CHECK_TYPE_ID == safecheck.CHECK_TYPE_ID && e.CHECK_TYPE_LEVEL_ID == safecheck.CHECK_TYPE_LEVEL_ID && e.Nav_ListMainDep.Any(); + Expression> expression = e => !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.CHECK_QUESTION_ID.HasValue && e.CHECK_TYPE_ID.HasValue && e.CHECK_PROJECT_ID.HasValue && e.CHECK_TYPE_ID == safecheck.CHECK_TYPE_ID && e.CHECK_TYPE_LEVEL_ID == safecheck.CHECK_TYPE_LEVEL_ID && e.Nav_ListMainDep.Any(); if (safecheck.CHECKOBJECT != 0) { expression = expression.And(e => e.CHECKOBJECT == safecheck.CHECKOBJECT); @@ -270,8 +270,7 @@ namespace APT.BS.WebApi.Controllers.Api } //wyw1114-1 - var listCheckMain = GetEntities(expression, null, new string[] { "Nav_RiskArea", "Nav_CheckProject", "Nav_CheckProjectCategory", "Nav_ListMainDep" }).OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.NUM); - + var listCheckMain = GetEntities(expression, null, new string[] { "Nav_RiskArea", "Nav_CheckProject", "Nav_ListMainDep" }).OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.NUM);//, "Nav_CheckProjectCategory" if (listCheckMain != null && listCheckMain.Any()) { var listMainID = listCheckMain.Where(e => e.CHECKPROOF != null && e.CHECKPROOF.Length > 0).Select(e => e.ID);//where 减少信息 @@ -9003,7 +9002,7 @@ namespace APT.BS.WebApi.Controllers.Api // 检查单 按区域 拆分导出 //检查人员 获取 - var listDetailUser = GetEntities(e => listIDs.Contains(e.SAFE_CHECK_ID), null, null).OrderByDescending(e=>e.ISMAINCHECK); + var listDetailUser = GetEntities(e => listIDs.Contains(e.SAFE_CHECK_ID), null, null).OrderByDescending(e => e.ISMAINCHECK); var listUserID = listDetailUser.Select(e => e.USER_ID).Distinct().ToList(); var listUser = GetEntities(e => listUserID.Contains(e.ID), null, null);