From 8cd5df11c474e4b799980f2d5928c72be5682ae5 Mon Sep 17 00:00:00 2001 From: cjy Date: Sat, 3 Aug 2024 11:57:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/Method/SeaExportService.cs | 4 ++-- .../DS.WMS.Core/Sys/Method/SysRoleService.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index 171878c9..5da78c73 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -522,11 +522,11 @@ public partial class SeaExportService : ISeaExportService } info = req.Adapt(info); //TODO 会计期间不允许小于已结转期间 - if (info.CloseDocDate.IsNotNull() && info.CloseDocDate < info.ETD) + if (info.CloseDocDate.IsNotNull() && info.CloseDocDate > info.ETD) { return await Task.FromResult(DataResult.Failed("截单日期不允许小于开船日期!", MultiLanguageConst.SeaExportCloseDocDateLimit)); } - if (info.ClosingDate.IsNotNull() && info.ClosingDate < info.ETD) + if (info.ClosingDate.IsNotNull() && info.ClosingDate > info.ETD) { return await Task.FromResult(DataResult.Failed("截港日期不允许小于开船日期!", MultiLanguageConst.SeaExportCloseDateLimit)); } diff --git a/ds-wms-service/DS.WMS.Core/Sys/Method/SysRoleService.cs b/ds-wms-service/DS.WMS.Core/Sys/Method/SysRoleService.cs index 3ed99716..cbef30c8 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Method/SysRoleService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Method/SysRoleService.cs @@ -218,8 +218,8 @@ public class SysRoleService : ISysRoleService IEnumerable delPermissions = existPermissions.AsQueryable().Except(model.PermissionIds); if (delPermissions.Count() > 0) { - db.Updateable() - .SetColumns(it => it.IsPermission == 0)//SetColumns是可以叠加的 写2个就2个字段赋值 + db.Deleteable() + //.SetColumns(it => it.IsPermission == 0)//SetColumns是可以叠加的 写2个就2个字段赋值 .Where(it => it.RoleId == model.RoleId && delPermissions.Contains(it.PermissionId)) .ExecuteCommand(); } @@ -258,10 +258,10 @@ public class SysRoleService : ISysRoleService IEnumerable delPermissions = existPermissions.AsQueryable().Except(model.PermissionIds); if (delPermissions.Count() > 0) { - db.Updateable() - .SetColumns(it => it.IsPermission == 0)//SetColumns是可以叠加的 写2个就2个字段赋值 - .Where(it => it.RoleId == model.RoleId && delPermissions.Contains(it.PermissionId)) - .ExecuteCommand(); + db.Deleteable() + //.SetColumns(it => it.IsPermission == 0)//SetColumns是可以叠加的 写2个就2个字段赋值 + .Where(it => it.RoleId == model.RoleId && delPermissions.Contains(it.PermissionId)) + .ExecuteCommand(); } IEnumerable addPermissions = model.PermissionIds.AsQueryable().Except(existPermissions); if (addPermissions.Count() > 0)