From 40c80d36225d82cd264deac89b5617ac3de273e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com> Date: Wed, 10 Apr 2024 11:46:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs | 1 + .../Controllers/CrucialLicenseJobOutsourceController.cs | 1 + .../Controllers/Api/CrucialTaskAnalysisController.cs | 1 + .../APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs | 1 + .../APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs | 1 + .../Controllers/Api/OperationTaskDistinguishAnalyzeController.cs | 1 + .../Controllers/Api/OrdinaryTaskAnalysisController.cs | 1 + 7 files changed, 7 insertions(+) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index 48b2243..e12737e 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -1543,6 +1543,7 @@ namespace APT.FO.WebApi.Controllers var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs index 1ff4dbe..a294d06 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -637,6 +637,7 @@ namespace APT.FO.WebApi.Controllers var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs index 864c1df..8c50d41 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs @@ -535,6 +535,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs index 1d67f28..1d3fdc0 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs @@ -830,6 +830,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t=>t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs index 956190c..4f23856 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs @@ -663,6 +663,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs index 6b14696..32dd22c 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs @@ -903,6 +903,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs index 6bdec6b..0ca0b67 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs @@ -660,6 +660,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)