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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -800,10 +800,11 @@ namespace Myshipping.Application
                 var mlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == input.Id).FirstAsync();
                 var rightlist = await _right.GetDataScopeList(MenuConst.MenuBookingOrder, true);
                 if (!(
-                    mlist.OPID == UserManager.UserId.ToString() ||
+                    mlist.OPID == UserManager.UserId.ToString() || mlist.OP == UserManager.Name.ToString()||
-                    mlist.DOCID == UserManager.UserId.ToString() ||
+                    mlist.DOCID == UserManager.UserId.ToString() || mlist.DOC == UserManager.Name.ToString() ||
-                    mlist.CUSTSERVICEID == UserManager.UserId.ToString() ||
+                    mlist.CUSTSERVICEID == UserManager.UserId.ToString() || mlist.CUSTSERVICE == UserManager.Name.ToString() ||
-                    mlist.ROUTEID == UserManager.UserId.ToString() || UserManager.UserId == 400234750476357 ||
+                    mlist.ROUTEID == UserManager.UserId.ToString() || mlist.ROUTE == UserManager.Name.ToString() ||
+                    UserManager.UserId == 400234750476357 ||
                     mlist.CreatedUserId.ToString() == UserManager.UserId.ToString() ||
                     rightlist.Contains((long)mlist.CreatedUserId)
                     ))

Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs

@@ -26,8 +26,8 @@ namespace Myshipping.Application
         private readonly ISysCacheService _sysCacheService;
         private readonly IBookingOrderService _bookingorderservice;
         private readonly SqlSugarRepository<BookingOrder> _order;
-        private readonly ILogger<DataSyncService> _logger;
+        private readonly ILogger<BookingVesselInfoService> _logger;
-        public BookingVesselInfoService(SqlSugarRepository<DjyVesselInfo> rep, ILogger<DataSyncService> logger, SqlSugarRepository<BookingOrder> order,ISysCacheService sysCacheService,IBookingOrderService bookingorderservice)
+        public BookingVesselInfoService(SqlSugarRepository<DjyVesselInfo> rep, ILogger<BookingVesselInfoService> logger, SqlSugarRepository<BookingOrder> order,ISysCacheService sysCacheService,IBookingOrderService bookingorderservice)
         {
             _sysCacheService = sysCacheService;
             _rep = rep;

Myshipping.Web.Core/dbsettings.json

@@ -24,10 +24,15 @@
         "DbType": "MySql",
         "DbString": "Data Source=60.209.125.238;Database=taskmanageplat;User ID=root;Password=Djy@Mysql.test;pooling=true;port=32006;sslmode=none;CharSet=utf8mb4;Convert Zero Datetime=True;Allow Zero Datetime=True;"
       },
+      //{
+      //  "DbNumber": "logs",
+      //  "DbType": "SqlServer",
+      //  "DbString": "Server=60.209.125.238,32009;Database=BookingLogs;User=sa;Password=sa@djy.net;MultipleActiveResultSets=True;"
+      //},
       {
         "DbNumber": "logs",
-        "DbType": "SqlServer",
+        "DbType": "MySql",
-        "DbString": "Server=60.209.125.238,32009;Database=BookingLogs;User=sa;Password=sa@djy.net;MultipleActiveResultSets=True;"
+        "DbString": "Data Source=60.209.125.238;Database=booking_hechuan_logs;User ID=root;Password=Djy@Mysql.test;pooling=true;port=32006;sslmode=none;CharSet=utf8mb4;Convert Zero Datetime=True;Allow Zero Datetime=True;"
       }
     ]
   }