1

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -952,7 +952,6 @@ namespace Myshipping.Application
         [HttpPost("/BookingOrder/Save")]
         public async Task<BookingOrderOutput> Save(BookingOrderDto input)
         {
-
             if (input == null)
             {
                 throw Oops.Bah("请传入正常数据！");
@@ -999,9 +998,6 @@ namespace Myshipping.Application
                 }
               
             }
-
-
-
             if (input.Id == 0)
             {
                 if (string.IsNullOrEmpty(entity.VOYNO))
@@ -1337,10 +1333,6 @@ namespace Myshipping.Application
 
 
                 #endregion
-
-
-
-
             }
 
             if (main != null)

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -1693,7 +1693,6 @@ namespace Myshipping.Application
         {
             var infolist = _vesselinfo.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID).ToList();
             var orderlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync();
-
             foreach (var item in dto)
             {
                 var model = infolist.Where(x => x.Vessel == item.Vessel && x.Voyno == item.Voyno).FirstOrDefault();
@@ -1702,6 +1701,7 @@ namespace Myshipping.Application
                     model.ETA = item.ETA;
                     model.YgtETD = item.ETD;
                     model.ATD = item.ATD;
+                    model.UpdatedTime = DateTime.Now;
                     await _vesselinfo.AsUpdateable(model).IgnoreColumns().ExecuteCommandAsync();
                 }
 
@@ -1825,12 +1825,9 @@ namespace Myshipping.Application
 
                             }
                         }
-
                     }
-
                 }
             }
-
         }
 
 

Myshipping.Core/Service/User/SysUserService.cs

@@ -399,7 +399,7 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
         srow.CreateCell(4).SetCellValue("状态");
         srow.CreateCell(5).SetCellValue("邮件");
 
-        var users = await _sysUserRep.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID).ToListAsync();
+        var users = await _sysUserRep.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID&&x.IsDeleted==false).ToListAsync();
         int i = 1;
         foreach (var item in users)
         {