去掉模糊查询
parent
7049653e72
commit
426f77d175
|
|
@ -58,9 +58,9 @@ namespace OpenAuth.App.ServiceApp
|
||||||
{
|
{
|
||||||
var list = await db.LasaDronePort.AsQueryable().Includes(a => a.UavList)
|
var list = await db.LasaDronePort.AsQueryable().Includes(a => a.UavList)
|
||||||
.Where(a => a.IsDelete == false)
|
.Where(a => a.IsDelete == false)
|
||||||
.WhereIF(!string.IsNullOrEmpty(sn), a => a.Sn.Contains(sn))
|
.WhereIF(!string.IsNullOrEmpty(sn), a => a.Sn == sn)
|
||||||
.WhereIF(!string.IsNullOrEmpty(type), a => a.TypeId.Contains(type))
|
.WhereIF(!string.IsNullOrEmpty(type), a => a.TypeId == type)
|
||||||
.WhereIF(!string.IsNullOrEmpty(workspaceid), a => a.WorkSpaceId.Contains(workspaceid))
|
.WhereIF(!string.IsNullOrEmpty(workspaceid), a => a.WorkSpaceId == workspaceid)
|
||||||
.ToPageListAsync(page, limit, totalCount);
|
.ToPageListAsync(page, limit, totalCount);
|
||||||
return new Response<PageInfo<List<LasaDronePort>>>
|
return new Response<PageInfo<List<LasaDronePort>>>
|
||||||
{
|
{
|
||||||
|
|
@ -158,9 +158,9 @@ namespace OpenAuth.App.ServiceApp
|
||||||
var list = await db.LasaUav.AsQueryable()
|
var list = await db.LasaUav.AsQueryable()
|
||||||
.LeftJoin<LasaDronePort>((a, b) => a.PId == b.Id)
|
.LeftJoin<LasaDronePort>((a, b) => a.PId == b.Id)
|
||||||
.Where((a, b) => a.IsDelete == false)
|
.Where((a, b) => a.IsDelete == false)
|
||||||
.WhereIF(!string.IsNullOrEmpty(sn), (a, b) => a.Sn.Contains(sn))
|
.WhereIF(!string.IsNullOrEmpty(sn), (a, b) => a.Sn == sn)
|
||||||
.WhereIF(!string.IsNullOrEmpty(type), (a, b) => a.TypeId.Contains(type))
|
.WhereIF(!string.IsNullOrEmpty(type), (a, b) => a.TypeId == type)
|
||||||
.WhereIF(!string.IsNullOrEmpty(workspaceid), (a, b) => a.WorkSpaceId.Contains(workspaceid))
|
.WhereIF(!string.IsNullOrEmpty(workspaceid), (a, b) => a.WorkSpaceId == workspaceid)
|
||||||
.Select<dynamic>((a, b) => new
|
.Select<dynamic>((a, b) => new
|
||||||
{
|
{
|
||||||
id = a.Id,
|
id = a.Id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue