diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 218c8dc4..8260b13a 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -77,6 +77,7 @@ using RabbitMQ.Client; using System.Configuration; using System.Collections; using System.Security.Principal; +using Myshipping.Core.Const; namespace Myshipping.Application { @@ -205,7 +206,7 @@ namespace Myshipping.Application public async Task PageData(BookingOrderInput input) { - List userlist = await _right.GetDataScopeList(351064299098181); + List userlist = await _right.GetDataScopeList(MenuConst.MenuBookingOrder); List pidlist = new List(); if (!string.IsNullOrWhiteSpace(input.SEALNO) || !string.IsNullOrWhiteSpace(input.CNTRNO)) { @@ -1277,6 +1278,7 @@ namespace Myshipping.Application } await _rep.UpdateAsync(x => dto.Id.Contains(x.Id), x => new BookingOrder { + VERSION = Guid.NewGuid().ToString(), VESSEL = dto.VESSEL, VOYNOINNER = dto.VOYNOINNER, ETD = dto.ETD, diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs index 3870f8d8..77434892 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs @@ -19,6 +19,7 @@ using Myshipping.Application.EDI; using Myshipping.Application.Entity; using Myshipping.Application.Helper; using Myshipping.Core; +using Myshipping.Core.Const; using Myshipping.Core.Entity; using Myshipping.Core.Helper; using Myshipping.Core.Service; @@ -812,7 +813,7 @@ namespace Myshipping.Application //&& t.STAT_TYPE == TaskStatLevelEnum.PERSON.ToString()) || (t.COMP_ID == userTendInfo.Tend.Id && t.STAT_TYPE == TaskStatLevelEnum.PUBLIC.ToString())).ToList(); //菜单375504048771141=我的任务台账 - List userlist = await _sysDataUserMenuService.GetDataScopeList(375504048771141); + List userlist = await _sysDataUserMenuService.GetDataScopeList(MenuConst.MenuTaskManage); bool isAdmin = userlist == null; //任务列表分组统计 @@ -1077,7 +1078,7 @@ namespace Myshipping.Application entityOrderCol = MapsterExtHelper.GetAdaptProperty(QuerySearch.SortField); //菜单375504048771141=我的任务台账 - List userlist = await _sysDataUserMenuService.GetDataScopeList(375504048771141); + List userlist = await _sysDataUserMenuService.GetDataScopeList(MenuConst.MenuTaskManage); if (userlist == null) userlist = new List { UserManager.UserId }; diff --git a/Myshipping.Core/Const/MenuConst.cs b/Myshipping.Core/Const/MenuConst.cs new file mode 100644 index 00000000..145a136c --- /dev/null +++ b/Myshipping.Core/Const/MenuConst.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Const +{ + public class MenuConst + { + /// + /// 订舱台账菜单 + /// + public const long MenuBookingOrder = 351064299098181; + /// + /// 我的任务台账 + /// + public const long MenuTaskManage = 375504048771141; + } +} diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 3b7c55fd..96d3fbcb 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -607,6 +607,16 @@ 新 用户数据权限缓存(自定义) + + + SysEmp + + + + + SysOrg + + 船公司