From a1851f53a10c88811c003740835061f3eb35718a Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Fri, 25 Nov 2022 10:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=BA=93=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/CommonDB/CommonDBService.cs        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
index 450ad907..2091b784 100644
--- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs
+++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
@@ -161,7 +161,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdateMappingCarrier([FromBody] MappingCarrierDto dto)
     {
         var list = await _sysCacheService.GetAllMappingCarrier();
-        var count = list.Where(x => x.Module == dto.Module && x.Code == dto.Code ).Count();
+        var count = list.Where(x => x.Module == dto.Module && x.Code == dto.Code && x.GID != dto.GID).Count();
         if (count>0) {
             throw Oops.Bah(ErrorCode.D1006);
         }
@@ -256,7 +256,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
 
 
         var list = await _sysCacheService.GetAllMappingVessel();
-        var count = list.Where(x => x.Name.Trim() == dto.Name.Trim()&&x.Module==dto.Module).Count();
+        var count = list.Where(x => x.Name.Trim() == dto.Name.Trim()&&x.Module==dto.Module && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);
@@ -387,7 +387,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
 
         var list = await _sysCacheService.GetAllMappingYard();
-        var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module).Count();
+        var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);
@@ -482,7 +482,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdatePortload([FromBody] MappingPortLoadDto dto)
     {
         var list = await _sysCacheService.GetAllMappingPortLoad();
-        var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module).Count();
+        var count = list.Where(x => x.Code == dto.Code&&x.Module==dto.Module && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);
@@ -577,7 +577,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdatePort([FromBody] MappingPortDto dto)
     {
         var list = await _sysCacheService.GetAllMappingPort();
-        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count();
+        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);
@@ -667,7 +667,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdateMappingPackage([FromBody] MappingPackageDto dto)
     {
         var list = await _sysCacheService.GetAllMappingPackage();
-        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count();
+        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);
@@ -759,7 +759,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdateMappingService([FromBody] MappingServiceDto dto)
     {
         var list = await _sysCacheService.GetAllMappingService();
-        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count();
+        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);
@@ -853,7 +853,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdateMappingCtn([FromBody] MappingCtnDto dto)
     {
         var list = await _sysCacheService.GetAllMappingCtn();
-        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count();
+        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module && x.GID != dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);
@@ -945,7 +945,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task AddOrUpdateMappingFrt([FromBody] MappingFrtDto dto)
     {
         var list = await _sysCacheService.GetAllMappingFrt();
-        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module).Count();
+        var count = list.Where(x => x.Code == dto.Code && x.Module == dto.Module&&x.GID!=dto.GID).Count();
         if (count > 0)
         {
             throw Oops.Bah(ErrorCode.D1006);