From 635cfcf6e4c6ba961fb6a6a29444708968333e41 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Tue, 18 Jul 2023 17:35:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 9 +++++---- .../BookingVesselInfo/BookingVesselInfoService.cs | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 53262c4c..efd4a586 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/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.DOCID == UserManager.UserId.ToString() || - mlist.CUSTSERVICEID == UserManager.UserId.ToString() || - mlist.ROUTEID == UserManager.UserId.ToString() || UserManager.UserId == 400234750476357 || + mlist.OPID == UserManager.UserId.ToString() || mlist.OP == UserManager.Name.ToString()|| + mlist.DOCID == UserManager.UserId.ToString() || mlist.DOC == UserManager.Name.ToString() || + mlist.CUSTSERVICEID == UserManager.UserId.ToString() || mlist.CUSTSERVICE == UserManager.Name.ToString() || + mlist.ROUTEID == UserManager.UserId.ToString() || mlist.ROUTE == UserManager.Name.ToString() || + UserManager.UserId == 400234750476357 || mlist.CreatedUserId.ToString() == UserManager.UserId.ToString() || rightlist.Contains((long)mlist.CreatedUserId) )) diff --git a/Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs b/Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs index 0cc5ef4d..49d3dd4f 100644 --- a/Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs +++ b/Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs @@ -26,8 +26,8 @@ namespace Myshipping.Application private readonly ISysCacheService _sysCacheService; private readonly IBookingOrderService _bookingorderservice; private readonly SqlSugarRepository _order; - private readonly ILogger _logger; - public BookingVesselInfoService(SqlSugarRepository rep, ILogger logger, SqlSugarRepository order,ISysCacheService sysCacheService,IBookingOrderService bookingorderservice) + private readonly ILogger _logger; + public BookingVesselInfoService(SqlSugarRepository rep, ILogger logger, SqlSugarRepository order,ISysCacheService sysCacheService,IBookingOrderService bookingorderservice) { _sysCacheService = sysCacheService; _rep = rep; From e9c286cf28b8df3250975ee1b576cc724006feef Mon Sep 17 00:00:00 2001 From: whm <86whm@163.com> Date: Tue, 18 Jul 2023 17:37:24 +0800 Subject: [PATCH 2/2] logs db --- Myshipping.Web.Core/dbsettings.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Myshipping.Web.Core/dbsettings.json b/Myshipping.Web.Core/dbsettings.json index 4202f9a9..c6071452 100644 --- a/Myshipping.Web.Core/dbsettings.json +++ b/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", - "DbString": "Server=60.209.125.238,32009;Database=BookingLogs;User=sa;Password=sa@djy.net;MultipleActiveResultSets=True;" + "DbType": "MySql", + "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;" } ] }