diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml index 1e5b1cbc..0ddd2b03 100644 --- a/Myshipping.Application/Myshipping.Application.xml +++ b/Myshipping.Application/Myshipping.Application.xml @@ -8832,7 +8832,7 @@ 船公司代号 - + 船公司 diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 45333948..8eba236c 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1525,9 +1525,13 @@ namespace Myshipping.Application var listOut = allList.Where(x => !arr.Contains(x.TypeCode)).ToList(); listReult.AddRange(listOut); + return listReult; + } + else + { + return allList; } - return listReult; } #endregion