diff --git a/APT.MicroApi/APT.FO.WebApi/App_Start/DIConfig.cs b/APT.MicroApi/APT.FO.WebApi/App_Start/DIConfig.cs index 8da50bd..7d7e518 100644 --- a/APT.MicroApi/APT.FO.WebApi/App_Start/DIConfig.cs +++ b/APT.MicroApi/APT.FO.WebApi/App_Start/DIConfig.cs @@ -57,6 +57,7 @@ namespace APT.FO.WebApi.App_Start builder.RegisterType().As().InstancePerLifetimeScope(); builder.RegisterType().As().InstancePerLifetimeScope(); builder.RegisterType().As().InstancePerLifetimeScope(); + builder.RegisterType().As().InstancePerLifetimeScope(); } } } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index 4ee0199..d78f815 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -678,9 +678,9 @@ namespace APT.FO.WebApi.Controllers //传入的识别表CODE不为空 if (!string.IsNullOrEmpty(filter.Keyword)) { - var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType; - var tempList = mineType.Split(",").ToList(); - var analyze = GetEntity(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用 && tempList.Contains(t.MineType.ToString()),new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" }); + //var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType; + //var tempList = mineType.Split(",").ToList(); + var analyze = GetEntity(t=>t.OPERATION_STEP_ID == Guid.Parse(filter.Keyword) && t.STATUS == (int)STATUSEnum.启用,new string[] { "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures" });//&& tempList.Contains(t.MineType.ToString()) if (analyze!=null) { main.AUDIT_LEVEL=analyze.AUDIT_LEVEL; diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs index 5eb41a2..549fee4 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs @@ -69,6 +69,7 @@ namespace APT.PF.WebApi.Controllers.Api.FM return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不正确" }); } } + filter.IgnoreOrgRule = true; } else { diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs index 6de7ed1..3e4353c 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs @@ -255,7 +255,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE [HttpPost, Route("OrderPaged")] public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter) { - return WitOrderPaged(t => t.ORIGINAL_NOTIFY_ID == null, pageFilter); + return WitOrderPaged(t => t.ORIGINAL_NOTIFY_ID != null, pageFilter); } public class notifyData {