diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index fc6a0bda..00ee0e52 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -8986,6 +8986,13 @@
+
+
+ 下拉筛选
+
+ 关键字
+
+
订舱客户联系人输出参数
@@ -10591,11 +10598,7 @@
主键Id
-
-
- 网站账号维护查询输入参数
-
-
+
主键Id
@@ -10611,16 +10614,6 @@
账号
-
-
- 密码
-
-
-
-
- 备注
-
-
网站账号维护输出参数
diff --git a/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs b/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs
index c13d9732..ea270b79 100644
--- a/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs
+++ b/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs
@@ -41,8 +41,8 @@ namespace Myshipping.Core.Service
[HttpGet("/DjyCustomer/page")]
public async Task Page([FromQuery] QueryDjyCustomerInput input)
{
+ List 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();
//}
-
+ ///
+ /// 下拉筛选
+ ///
+ /// 关键字
+ ///
+ [HttpGet("/DjyCustomer/Suggest")]
+ public async Task Suggest(string keyword)
+ {
+ List 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();
+ }
}
}
diff --git a/Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs b/Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs
index 6d79c0f2..c8b1f5dc 100644
--- a/Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs
+++ b/Myshipping.Core/Service/DjyWebsiteAccountConfig/Dto/DjyWebsiteAccountConfigInput.cs
@@ -66,7 +66,7 @@ namespace Myshipping.Core.Service
}
///
- /// 网站账号维护查询输入参数
+ ///// 网站账号维护查询输入参数
///
public class QueryDjyWebsiteAccountConfigInput : PageInputBase
{
@@ -85,15 +85,15 @@ namespace Myshipping.Core.Service
///
public virtual string Account { get; set; }
- ///
- /// 密码
- ///
- public virtual string Password { get; set; }
+ /////
+ ///// 密码
+ /////
+ //public virtual string Password { get; set; }
- ///
- /// 备注
- ///
- public virtual string Remark { get; set; }
+ /////
+ ///// 备注
+ /////
+ //public virtual string Remark { get; set; }
}
}