Compare commits
2 Commits
b80bb75651
...
cb3730a876
| Author | SHA1 | Date |
|---|---|---|
|
|
cb3730a876 | |
|
|
426f77d175 |
|
|
@ -59,9 +59,9 @@ namespace OpenAuth.App.ServiceApp
|
|||
{
|
||||
var list = await db.LasaDronePort.AsQueryable().Includes(a => a.UavList)
|
||||
.Where(a => a.IsDelete == false)
|
||||
.WhereIF(!string.IsNullOrEmpty(sn), a => a.Sn.Contains(sn))
|
||||
.WhereIF(!string.IsNullOrEmpty(type), a => a.TypeId.Contains(type))
|
||||
.WhereIF(!string.IsNullOrEmpty(workspaceid), a => a.WorkSpaceId.Contains(workspaceid))
|
||||
.WhereIF(!string.IsNullOrEmpty(sn), a => a.Sn == sn)
|
||||
.WhereIF(!string.IsNullOrEmpty(type), a => a.TypeId == type)
|
||||
.WhereIF(!string.IsNullOrEmpty(workspaceid), a => a.WorkSpaceId == workspaceid)
|
||||
.ToPageListAsync(page, limit, totalCount);
|
||||
return new Response<PageInfo<List<LasaDronePort>>>
|
||||
{
|
||||
|
|
@ -160,9 +160,9 @@ namespace OpenAuth.App.ServiceApp
|
|||
var list = await db.LasaUav.AsQueryable()
|
||||
.LeftJoin<LasaDronePort>((a, b) => a.PId == b.Id)
|
||||
.Where((a, b) => a.IsDelete == false)
|
||||
.WhereIF(!string.IsNullOrEmpty(sn), (a, b) => a.Sn.Contains(sn))
|
||||
.WhereIF(!string.IsNullOrEmpty(type), (a, b) => a.TypeId.Contains(type))
|
||||
.WhereIF(!string.IsNullOrEmpty(workspaceid), (a, b) => a.WorkSpaceId.Contains(workspaceid))
|
||||
.WhereIF(!string.IsNullOrEmpty(sn), (a, b) => a.Sn == sn)
|
||||
.WhereIF(!string.IsNullOrEmpty(type), (a, b) => a.TypeId == type)
|
||||
.WhereIF(!string.IsNullOrEmpty(workspaceid), (a, b) => a.WorkSpaceId == workspaceid)
|
||||
.Select<dynamic>((a, b) => new
|
||||
{
|
||||
id = a.Id,
|
||||
|
|
|
|||
Loading…
Reference in New Issue