|
|
|
|
@ -395,7 +395,7 @@ namespace Myshipping.Application
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet("/BookingPrintTemplate/GetPrinttemplateRightList")]
|
|
|
|
|
public async Task<dynamic> GetPrinttemplateRightList(long userId, string cateCode, string type)
|
|
|
|
|
public async Task<dynamic> GetPrinttemplateRightList(long userId, string cateCode, string type,string name)
|
|
|
|
|
{
|
|
|
|
|
var userlist = await _repUser.AsQueryable().Filter(null, true).ToListAsync();
|
|
|
|
|
var list = await _repRight.AsQueryable().InnerJoin<BookingPrintTemplate>((d, t) => d.PrintTemplateId == t.Id && t.TenantId == UserManager.TENANT_ID).
|
|
|
|
|
@ -417,7 +417,7 @@ namespace Myshipping.Application
|
|
|
|
|
UserName = "",
|
|
|
|
|
}).ToListAsync();
|
|
|
|
|
|
|
|
|
|
list = list.WhereIF(!string.IsNullOrWhiteSpace(cateCode), x => x.CateCode == cateCode).
|
|
|
|
|
list = list.WhereIF(!string.IsNullOrWhiteSpace(cateCode), x => x.CateCode == cateCode).WhereIF(!string.IsNullOrWhiteSpace(name), x => x.DisplayName.StartsWith(name)).
|
|
|
|
|
WhereIF(!string.IsNullOrWhiteSpace(type), x => x.Type == type).ToList();
|
|
|
|
|
foreach (var item in list)
|
|
|
|
|
{
|
|
|
|
|
|
