From b629451ec7f80726fc2e3b00fd17b6ca46b55b10 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Thu, 18 May 2023 14:24:22 +0800
Subject: [PATCH] sort

---
 .../Service/BookingOrder/BookingOrderService.cs          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 72283e64..40b25a2b 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -766,10 +766,11 @@ namespace Myshipping.Application
             {
                 arr.Add(Id);
             }
-            else {
+            else
+            {
                 arr.Add((long)main.ParentId);
             }
-          
+
             var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
             if (!string.IsNullOrEmpty(itemcode))
             {
@@ -5662,7 +5663,7 @@ namespace Myshipping.Application
             var Forwarder = _cache.GetAllCodeForwarder().Result.Take(10).ToList();
             var GoodsName = _paraGoodsInfoRepository.AsQueryable().OrderBy("GOODS_CODE asc").Take(50).ToList().Select(t => t.Adapt<ParaGoodsShowDto>()).ToList();
             var YFXY = _paraContractNoInfoRepository.AsQueryable().OrderBy("CONTRACT_NO asc").Take(10).ToList().Select(t => t.Adapt<ParaContractNoShowDto>()).ToList(); ;
-            var User = _repUser.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID && x.Status == CommonStatus.ENABLE&&x.IsDeleted==false).OrderByDescending(x=>x.Name).ToListAsync();
+            var User = await _repUser.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID && x.Status == CommonStatus.ENABLE && x.IsDeleted == false).OrderByDescending(x => x.Name).ToListAsync();
             var Service = _cache.GetAllCodeService().Result.Take(10).ToList();
             dynamic obj = new
             {
@@ -5678,7 +5679,7 @@ namespace Myshipping.Application
                 WTDW = WTDW,
                 DCDL = DCDL,
                 GoodsName = GoodsName,
-                User = User,
+                User = User.OrderByDescending(x => x.Name).ToList(),
                 Forwarder = Forwarder,
                 Service = Service,
                 contractno = YFXY,