添加人员分组
parent
1085c162b1
commit
c2e2236c63
|
|
@ -89,12 +89,13 @@ namespace OpenAuth.App.ServiceApp.FireManagement
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="username"></param>
|
/// <param name="username"></param>
|
||||||
/// <returns></returns>
|
/// <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())
|
using (var db = base.UnitWork.CreateContext())
|
||||||
{
|
{
|
||||||
var users = await db.User.AsQueryable()
|
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)
|
.Where(r => r.Status == 0)
|
||||||
.Select(r => new SysUserResp
|
.Select(r => new SysUserResp
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -57,5 +57,9 @@ namespace OpenAuth.Repository.Domain
|
||||||
public long CreateId { get; set; }
|
public long CreateId { get; set; }
|
||||||
[Description("加密密钥")]
|
[Description("加密密钥")]
|
||||||
public string Secretkey { get; set; }
|
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>
|
/// <param name="username"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[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>>();
|
Response<List<SysUserResp>> response = new Response<List<SysUserResp>>();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return await _app.LoadFireClueUser(username);
|
return await _app.LoadFireClueUser(username, unitname);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue