From 5823305d700c3831f08455bbadba6a1710b6979a Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Thu, 23 Oct 2025 15:44:39 +0800 Subject: [PATCH] 234b --- .../Controllers/Api/NotificationTaskController.cs | 2 +- .../Controllers/Api/AppVersionInfoController.cs | 2 +- .../APT.PF.WebApi/Controllers/Api/ApproveController.cs | 2 +- .../Controllers/Api/RiskIdentifyController.cs | 9 +++++++-- APT.Utility/HeadHelper.cs | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs index e7d69e3..c3d0b1a 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs @@ -174,7 +174,7 @@ namespace APT.FM.WebApi.Controllers.Api appFilter.Order = DbOrder.DESC; appFilter.Sort = "CREATE_TIME"; //查询指定租户 - appFilter.SpecifyTenant = "0003"; + appFilter.SpecifyTenant = "003"; appFilter.IsSpecifyDb = true; appFilter.IgnoreOrgRule = true; var appVersion = this.GetEntity(null, appFilter, "Nav_Files.Nav_ImgFile"); diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs index 7e4a0f3..0648802 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/AppVersionInfoController.cs @@ -30,7 +30,7 @@ namespace APT.PF.WebApiControllers.Api.PF { BaseFilter filter = new BaseFilter(); filter.IsSpecifyDb = true; - filter.SpecifyTenant = "0003"; + filter.SpecifyTenant = "003"; filter.IgnoreOrgRule = true; filter.Order = DbOrder.DESC; filter.Sort = "CREATE_TIME"; diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs index a458d68..9f62c71 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs @@ -651,7 +651,7 @@ return SafeExecute(() => { T_PF_APPROVE result = null; - if (!string.IsNullOrEmpty(filter.Parameter1) && filter.OrgId.HasValue && filter.Parameter1 != filter.OrgId.Value.ToString()) + if (!string.IsNullOrEmpty(filter.Parameter22) && filter.OrgId.HasValue && filter.Parameter22 != filter.OrgId.Value.ToString()) { //集团人员 通过 首页点击 获取对应的数据库链接 返回结果 diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs index 318d8ad..105ede9 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs @@ -216,11 +216,16 @@ namespace APT.SK.WebApi.Controllers.Api if (string.IsNullOrEmpty(id)) this.ThrowError("060010"); filter.IgnoreDataRule = true; - var result = this.GetEntity(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require", + + KeywordFilter filter2 = new KeywordFilter(); + filter2.IgnoreDataRule = true; + filter2.IgnoreOrgRule = true; + filter2.OrgId = null; + var result = this.GetEntity(e => e.ID == new Guid(id), filter2, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require", "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); if (result != null) { - var details = this.GetEntities(t => t.RISK_IDENTIFY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit"); + var details = this.GetEntities(t => t.RISK_IDENTIFY_ID == result.ID, filter2, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit"); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); if (result.STATUS == PFStandardStatus.Rejected) { diff --git a/APT.Utility/HeadHelper.cs b/APT.Utility/HeadHelper.cs index 51591c7..498730c 100644 --- a/APT.Utility/HeadHelper.cs +++ b/APT.Utility/HeadHelper.cs @@ -8,7 +8,7 @@ namespace APT.Utility /// /// 地球半径 /// - public const string HeadtelnetCode = "0003"; + public const string HeadtelnetCode = "003"; public static bool GetIsHead(IHeaderDictionary Headers) {