添加人员分组
parent
1085c162b1
commit
c2e2236c63
|
|
@ -89,12 +89,13 @@ namespace OpenAuth.App.ServiceApp.FireManagement
|
|||
/// </summary>
|
||||
/// <param name="username"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username)
|
||||
public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username, string unitname)
|
||||
{
|
||||
using (var db = base.UnitWork.CreateContext())
|
||||
{
|
||||
var users = await db.User.AsQueryable()
|
||||
.WhereIF(string.IsNullOrEmpty(username), r => r.Name.Contains(username))
|
||||
.WhereIF(!string.IsNullOrEmpty(username), r => r.Name.Contains(username))
|
||||
.WhereIF(!string.IsNullOrEmpty(unitname), r => r.UnitName.Contains(username))
|
||||
.Where(r => r.Status == 0)
|
||||
.Select(r => new SysUserResp
|
||||
{
|
||||
|
|
|
|||
|
|
@ -57,5 +57,9 @@ namespace OpenAuth.Repository.Domain
|
|||
public long CreateId { get; set; }
|
||||
[Description("加密密钥")]
|
||||
public string Secretkey { get; set; }
|
||||
/// <summary>
|
||||
/// 单位名称
|
||||
/// </summary>
|
||||
public string UnitName { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
@ -48,12 +48,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="username"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username)
|
||||
public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username, string unitname)
|
||||
{
|
||||
Response<List<SysUserResp>> response = new Response<List<SysUserResp>>();
|
||||
try
|
||||
{
|
||||
return await _app.LoadFireClueUser(username);
|
||||
return await _app.LoadFireClueUser(username, unitname);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
@ -87,7 +87,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// 查询人员单位信息
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[HttpGet]
|
||||
public async Task<Response<List<FmUserUnit>>> GetUserUnit()
|
||||
{
|
||||
Response<List<FmUserUnit>> response = new Response<List<FmUserUnit>>();
|
||||
|
|
|
|||
Loading…
Reference in New Issue