租户公司统一维护客户信息,根据权限范围查看

booking_auth_dev
wanghaomei 2 years ago
parent 4846349d4a
commit cb15519151

@ -8986,6 +8986,13 @@
<param name="customerId"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.DjyCustomerService.Suggest(System.String)">
<summary>
下拉筛选
</summary>
<param name="keyword">关键字</param>
<returns></returns>
</member>
<member name="T:Myshipping.Core.Service.DjyCustomerContactDto">
<summary>
订舱客户联系人输出参数
@ -10591,11 +10598,7 @@
主键Id
</summary>
</member>
<member name="T:Myshipping.Core.Service.QueryDjyWebsiteAccountConfigInput">
<summary>
网站账号维护查询输入参数
</summary>
</member>
<!-- Badly formed XML comment ignored for member "T:Myshipping.Core.Service.QueryDjyWebsiteAccountConfigInput" -->
<member name="P:Myshipping.Core.Service.QueryDjyWebsiteAccountConfigInput.Id">
<summary>
主键Id
@ -10611,16 +10614,6 @@
账号
</summary>
</member>
<member name="P:Myshipping.Core.Service.QueryDjyWebsiteAccountConfigInput.Password">
<summary>
密码
</summary>
</member>
<member name="P:Myshipping.Core.Service.QueryDjyWebsiteAccountConfigInput.Remark">
<summary>
备注
</summary>
</member>
<member name="T:Myshipping.Core.Service.DjyWebsiteAccountConfigOutput">
<summary>
网站账号维护输出参数

@ -41,8 +41,8 @@ namespace Myshipping.Core.Service
[HttpGet("/DjyCustomer/page")]
public async Task<dynamic> Page([FromQuery] QueryDjyCustomerInput input)
{
List<long> userlist = await DataFilterExtensions.GetDataScopeIdList();
var entities = await _rep.AsQueryable()
.Where(m => m.CreatedUserId == UserManager.UserId)
.WhereIF(!string.IsNullOrWhiteSpace(input.CodeName), u => u.CodeName.Contains(input.CodeName.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.ShortName), u => u.ShortName.Contains(input.ShortName.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.FullName), u => u.FullName.Contains(input.FullName.Trim()))
@ -65,6 +65,7 @@ namespace Myshipping.Core.Service
.WhereIF(!string.IsNullOrWhiteSpace(input.USDBank), u => u.USDBank.Contains(input.USDBank.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.USDAccount), u => u.USDAccount.Contains(input.USDAccount.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.ShortName.Contains(input.SearchValue.Trim()) || u.CodeName.Contains(input.SearchValue.Trim()))
.Where(u => userlist.Contains((long)u.CreatedUserId))
.ToPagedListAsync(input.PageNo, input.PageSize);
return entities.XnPagedResult();
}
@ -171,7 +172,21 @@ namespace Myshipping.Core.Service
// return await _rep.ToListAsync();
//}
/// <summary>
/// 下拉筛选
/// </summary>
/// <param name="keyword">关键字</param>
/// <returns></returns>
[HttpGet("/DjyCustomer/Suggest")]
public async Task<dynamic> Suggest(string keyword)
{
List<long> userlist = await DataFilterExtensions.GetDataScopeIdList();
var entities = await _rep.AsQueryable().Filter(null, true)
.Where(x => x.TenantId == UserManager.TENANT_ID)
.WhereIF(!string.IsNullOrWhiteSpace(keyword), u => u.CodeName.Contains(keyword) || u.ShortName.Contains(keyword))
.ToPagedListAsync(1, 10);
return entities.XnPagedResult();
}
}
}

@ -66,7 +66,7 @@ namespace Myshipping.Core.Service
}
/// <summary>
/// 网站账号维护查询输入参数
///// 网站账号维护查询输入参数
/// </summary>
public class QueryDjyWebsiteAccountConfigInput : PageInputBase
{
@ -85,15 +85,15 @@ namespace Myshipping.Core.Service
/// </summary>
public virtual string Account { get; set; }
/// <summary>
/// 密码
/// </summary>
public virtual string Password { get; set; }
///// <summary>
///// 密码
///// </summary>
//public virtual string Password { get; set; }
/// <summary>
/// 备注
/// </summary>
public virtual string Remark { get; set; }
///// <summary>
///// 备注
///// </summary>
//public virtual string Remark { get; set; }
}
}

Loading…
Cancel
Save