diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml index 60967dec..0abd8bd9 100644 --- a/Myshipping.Application/Myshipping.Application.xml +++ b/Myshipping.Application/Myshipping.Application.xml @@ -5268,7 +5268,7 @@ - + 调用运踪接口 diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index f155a7ff..a8cf5444 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -141,8 +141,8 @@ namespace Myshipping.Application [HttpGet("/BookingOrder/Page")] public async Task Page([FromQuery] BookingOrderInput input) { - //List userlist = await _right.GetDataScopeList(351064299098181); - List userlist = await DataFilterExtensions.GetDataScopeIdList(); + List userlist = await _right.GetDataScopeList(351064299098181); + //List userlist = await DataFilterExtensions.GetDataScopeIdList(); var entities = await _rep.AsQueryable().Where(x => x.ParentId == 0) .WhereIF(!string.IsNullOrWhiteSpace(input.BSNO), u => u.BSNO.Contains(input.BSNO)) .WhereIF(!string.IsNullOrWhiteSpace(input.BSSTATUS), u => u.BSSTATUS == input.BSSTATUS) @@ -2532,8 +2532,6 @@ namespace Myshipping.Application await _bookingfile.InsertAsync(bookFile); } - - #region 下载订舱、截单EDI /// /// 下载订舱、截单EDI diff --git a/Myshipping.Core/Entity/SysUserDataScope.cs b/Myshipping.Core/Entity/SysUserDataScope.cs index dd1aafbe..2b631c91 100644 --- a/Myshipping.Core/Entity/SysUserDataScope.cs +++ b/Myshipping.Core/Entity/SysUserDataScope.cs @@ -15,8 +15,6 @@ public class SysUserDataScope /// public long SysUserId { get; set; } - - /// /// 机构Id /// diff --git a/Myshipping.Core/Service/User/SysDataUserMenu.cs b/Myshipping.Core/Service/User/SysDataUserMenu.cs index ddad0a9a..01b1595b 100644 --- a/Myshipping.Core/Service/User/SysDataUserMenu.cs +++ b/Myshipping.Core/Service/User/SysDataUserMenu.cs @@ -19,7 +19,8 @@ namespace Myshipping.Core.Service; /// /// 用户数据范围 /// -public class SysDataUserMenuService : ISysDataUserMenu, ITransient +[ApiDescriptionSettings(Name = "SysDataUserMenu", Order = 150)] +public class SysDataUserMenuService : ISysDataUserMenu, IDynamicApiController,ITransient { private readonly SqlSugarRepository _rep; // 用户数据范围表仓储 private readonly ISysCacheService _sysCache;//缓存