Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -731,7 +731,16 @@ namespace Myshipping.Application
             {
 
                 var mlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == input.Id).FirstAsync();
-                if (!(mlist.OPID == UserManager.UserId.ToString() || mlist.DOCID == UserManager.UserId.ToString() || mlist.CUSTSERVICEID == UserManager.UserId.ToString() || mlist.ROUTEID == UserManager.UserId.ToString() || mlist.CreatedUserId.ToString() == UserManager.UserId.ToString() || UserManager.DjyUserId == "d85fd590-d9f6-4410-93a1-f6fac77b606e"))
+                var rightlist= await _right.GetDataScopeList(MenuConst.MenuBookingOrder,true);
+                if (!(
+                    mlist.OPID == UserManager.UserId.ToString() || 
+                    mlist.DOCID == UserManager.UserId.ToString() ||
+                    mlist.CUSTSERVICEID == UserManager.UserId.ToString() ||
+                    mlist.ROUTEID == UserManager.UserId.ToString() ||
+                    mlist.CreatedUserId.ToString() == UserManager.UserId.ToString() ||
+                    UserManager.DjyUserId == "d85fd590-d9f6-4410-93a1-f6fac77b606e"||
+                    rightlist.Contains((long)mlist.CreatedUserId)
+                    ))
                 {
                     throw Oops.Bah("您没有当前单据的操作权限！");
                 }

Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs

@@ -306,8 +306,7 @@ namespace Myshipping.Application
                     mDATA.FORWARDER =
                         _cache.GetAllMappingForwarder().Result.Where(x => x.Code == FORWARDER && x.Module == "cangdan").Select(x => x.MapCode).FirstOrDefault();
 
-
-                    mDATA.YARDID = _cache.GetAllCodeYard().Result.Where(x => x.Code == YardCode).Select(x => x.ShowCode).FirstOrDefault();
+                    mDATA.YARDID = _cache.GetAllMappingYard().Result.Where(x => x.Code == YardCode && x.Module == "cangdan").Select(x => x.MapCode).FirstOrDefault();
                     CTNDATA = ctns.Adapt<List<CTNDATAItem>>();
                     foreach (var item in CTNDATA)
                     {

Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs

@@ -161,12 +161,11 @@ namespace Myshipping.Application
                     }
                     if (issend)
                     {
-                        await _bookingorderservice.SendBookingOrder(order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray());
-
-
-
-
-
+                        var ids = order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray();
+                        if (ids.Count() > 0)
+                        {
+                            await _bookingorderservice.SendBookingOrder(ids);
+                        }
                     }
                 }
 

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -564,7 +564,12 @@ namespace Myshipping.Application
                             //}
                         }
                     }
-                    await _bookingorderservice.SendBookingOrder(order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray());
+
+                    var ids = order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray();
+                    if (ids.Count()>0) {
+                        await _bookingorderservice.SendBookingOrder(ids);
+                    }
+                    
 
                 }
             }
@@ -1790,7 +1795,11 @@ namespace Myshipping.Application
                     }
                     if (issend)
                     {
-                        await _bookingorderservice.SendBookingOrder(order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray());
+                        var ids = order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray();
+                        if (ids.Count() > 0)
+                        {
+                            await _bookingorderservice.SendBookingOrder(ids);
+                        }
                     }
                 }
             }
@@ -1964,12 +1973,14 @@ namespace Myshipping.Application
                             issend = true;
                             await _rep.AsUpdateable(it).IgnoreColumns().ExecuteCommandAsync();
                         }
-
-
                     }
                     if (issend)
                     {
-                        await _bookingorderservice.SendBookingOrder(order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray());
+                        var ids = order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray();
+                        if (ids.Count() > 0)
+                        {
+                            await _bookingorderservice.SendBookingOrder(ids);
+                        }
 
                     }
 

Myshipping.Core/Service/User/SysDataUserMenu.cs

@@ -202,6 +202,7 @@ public class SysDataUserMenuService : ISysDataUserMenu, IDynamicApiController, I
         }
 
         DataScopeType _dataScopeType = list.Where(x => x.SysMenuId == menuid && x.SysUserId == UserManager.UserId).WhereIF(IsEdit == true, x => x.IsEdit == true).Select(x => x.DataScopeType).FirstOrDefault();
+        //全部数据返回null
         if (_dataScopeType == DataScopeType.ALL)
         {
             datascope = null;
@@ -240,10 +241,6 @@ public class SysDataUserMenuService : ISysDataUserMenu, IDynamicApiController, I
         {
             datascope.Add(UserManager.UserId);
         }
-        if (IsEdit && datascope == null)
-        {
-            datascope.Add(UserManager.UserId);
-        }
         return datascope;
     }