修改机场和无人机所属项目

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -58,10 +58,25 @@ namespace OpenAuth.App.ServiceApp
             using (var db = UnitWork.CreateContext())
             {
                 var list = await db.LasaDronePort.AsQueryable().Includes(a => a.UavList)
+                    .LeftJoin<LasaSpaceDevice>((a,b)=>a.Id==b.DeviceId)
                     .Where(a => a.IsDelete == false)
-                    .WhereIF(!string.IsNullOrEmpty(sn), a => a.Sn == sn)
-                    .WhereIF(!string.IsNullOrEmpty(type), a => a.TypeId == type)
-                    .WhereIF(!string.IsNullOrEmpty(workspaceid), a => a.WorkSpaceId == 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) => b.WorkSpaceId == workspaceid)
+                    .Select((a,b)=>new LasaDronePort
+                    {
+                        Id = a.Id,
+                        Name = a.Name,
+                        TypeId = a.TypeId,
+                        FirmwareVersion = a.FirmwareVersion,
+                        CreateTime = a.CreateTime,
+                        UpdateTime = a.UpdateTime,
+                        OrgId = a.OrgId,
+                        Sn = a.Sn,
+                        UavList = a.UavList,
+                        GateWay = a.GateWay,
+                        WorkSpaceId = b.WorkSpaceId
+                    })
                     .ToPageListAsync(page, limit, totalCount);
                 return new Response<PageInfo<List<LasaDronePort>>>
                 {
@@ -159,11 +174,12 @@ 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 == sn)
-                    .WhereIF(!string.IsNullOrEmpty(type), (a, b) => a.TypeId == type)
-                    .WhereIF(!string.IsNullOrEmpty(workspaceid), (a, b) => a.WorkSpaceId == workspaceid)
-                    .Select<dynamic>((a, b) => new
+                    .LeftJoin<LasaSpaceDevice>((a, b,c) => b.Id == c.DeviceId)
+                    .Where((a, b, c) => a.IsDelete == false)
+                    .WhereIF(!string.IsNullOrEmpty(sn), (a, b, c) => a.Sn == sn)
+                    .WhereIF(!string.IsNullOrEmpty(type), (a, b, c) => a.TypeId == type)
+                    .WhereIF(!string.IsNullOrEmpty(workspaceid), (a, b, c) => c.WorkSpaceId == workspaceid)
+                    .Select<dynamic>((a, b,c) => new
                     {
                         id = a.Id,
                         name = a.Name,
@@ -174,7 +190,7 @@ namespace OpenAuth.App.ServiceApp
                         updateTime = a.UpdateTime,
                         isDelete = a.IsDelete,
                         pName = b.Name, // 机场名称
-                        workSpaceId = a.WorkSpaceId,
+                        workSpaceId = c.WorkSpaceId,
                         firmwareVersion = a.FirmwareVersion,
                     })
                     .ToPageListAsync(page, limit, totalCount);