ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wyw 2024-04-09 16:40:25 +08:00
commit 1e41bf3585
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
APT.MicroApi/APT.FO.WebApi/App_Start/DIConfig.cs
View File

@ -57,6 +57,7 @@ namespace APT.FO.WebApi.App_Start
builder.RegisterType<ExtConnConfigService>().As<IExtConnConfigService>().InstancePerLifetimeScope(); builder.RegisterType<ExtConnConfigService>().As<IExtConnConfigService>().InstancePerLifetimeScope();
builder.RegisterType<FMNotificationTaskService>().As<IFMNotificationTaskService>().InstancePerLifetimeScope(); builder.RegisterType<FMNotificationTaskService>().As<IFMNotificationTaskService>().InstancePerLifetimeScope();
builder.RegisterType<BSSafeCheckService>().As<IBSSafeCheckService>().InstancePerLifetimeScope(); builder.RegisterType<BSSafeCheckService>().As<IBSSafeCheckService>().InstancePerLifetimeScope();
builder.RegisterType<BSOperateLogService>().As<IBSOperateLogService>().InstancePerLifetimeScope();
} }
} }
} }

6
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -678,9 +678,9 @@ namespace APT.FO.WebApi.Controllers
//传入的识别表CODE不为空 //传入的识别表CODE不为空
if (!string.IsNullOrEmpty(filter.Keyword)) if (!string.IsNullOrEmpty(filter.Keyword))
{ {
var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType; //var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType;
var tempList = mineType.Split(",").ToList(); //var tempList = mineType.Split(",").ToList();
var analyze = GetEntity<T_HM_OPERATION_LINK>(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 analyze = GetEntity<T_HM_OPERATION_LINK>(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) if (analyze!=null)
{ {
main.AUDIT_LEVEL=analyze.AUDIT_LEVEL; main.AUDIT_LEVEL=analyze.AUDIT_LEVEL;

1
APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs
View File

@ -69,6 +69,7 @@ namespace APT.PF.WebApi.Controllers.Api.FM
return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不正确" }); return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不正确" });
} }
} }
filter.IgnoreOrgRule = true;
} }
else else
{ {

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs
View File

@ -255,7 +255,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
[HttpPost, Route("OrderPaged")] [HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SE_TRAIN_NOTIFY> OrderPaged([FromBody] KeywordPageFilter pageFilter) public PagedActionResult<T_SE_TRAIN_NOTIFY> 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 public class notifyData
{ {