船期@改为船期维护人

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -424,7 +424,7 @@ namespace Myshipping.Application
             var mapcarrier = _mapcarrier.Where(x => x.Module == "HeChuan").ToList();
             var userlist = _repUser.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID).ToList();
             var mlist = _vesselinfo.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID).ToList();
-           var orderlist=  _rep.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToList();
+            var orderlist = _rep.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToList();
             foreach (var item in model)
             {
 
@@ -584,7 +584,7 @@ namespace Myshipping.Application
             var userlist = await _repUser.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID).ToListAsync();
             var djycustomer = await _djycustomer.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID).ToListAsync();
             var goodsconfig = await _goodsStatusConfig.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID).ToListAsync();
-            var orderlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false&& x.TenantId == UserManager.TENANT_ID).ToListAsync();
+            var orderlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID).ToListAsync();
             var linelist = await _repline.AsQueryable().Filter(null, true).Where(m => m.TenantId == UserManager.TENANT_ID).ToListAsync();
 
             foreach (var model in list)
@@ -603,7 +603,7 @@ namespace Myshipping.Application
                 {
                     throw Oops.Bah($"未匹配到创建人{model.CreatedUserName.Trim()}请联系管理员添加相关用户");
                 }
-                var order =  orderlist.Where(x => x.BSNO == model.BSNO ).FirstOrDefault();
+                var order = orderlist.Where(x => x.BSNO == model.BSNO).FirstOrDefault();
 
 
                 if (order == null)
@@ -2187,14 +2187,17 @@ namespace Myshipping.Application
                     var usrList = _repUser.AsQueryable().Filter(null, true).Where(u => u.TenantId == tenantId && !u.IsDeleted).ToList();
                     Dictionary<string, List<string>> dic = new Dictionary<string, List<string>>();
 
-                    //遍历船名航次，查询订舱数据
+                    //遍历船名航次，查询船期维护人
                     foreach (var item in dto)
                     {
-                        var boUserList = _rep.AsQueryable().Filter(null, true).Where(x => x.VESSEL == item.Vessel && x.VOYNO == item.Voyno && (x.ParentId == 0 || x.ParentId == null) && !x.IsDeleted && x.TenantId == tenantId)
-                              .Select(x => x.CreatedUserId).ToList();
-                        if (boUserList.Count > 0)
+                        var veUserList = _vesselinfo.AsQueryable().Filter(null, true)
+                        .Where(v => v.TenantId == tenantId && v.Vessel == item.Vessel && v.Voyno == item.Voyno && !v.IsDeleted)
+                        .Select(x => x.CreatedUserId)
+                        .ToList();
+
+                        if (veUserList.Count > 0)
                         {
-                            var phoneList = usrList.Where(u => boUserList.Contains(u.Id) && u.Phone != "" && u.Phone != null).Select(x => x.Phone).ToList();
+                            var phoneList = usrList.Where(u => veUserList.Contains(u.Id) && u.Phone != "" && u.Phone != null).Select(x => x.Phone).ToList();
 
                             foreach (var phone in phoneList)
                             {