From 94d5c86e0ce95c2bb5e6fd7d00b7efb4c2e280f4 Mon Sep 17 00:00:00 2001
From: wtp <1813748440@qq.com>
Date: Fri, 4 Aug 2023 16:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=85=B7=E4=BD=93=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Services/OrderService.cs            |  3 +-
 .../Util/MiniProgramUtil.cs                   | 35 ++++++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/Znyc.Dispatching.Application/Order/Services/OrderService.cs b/src/Znyc.Dispatching.Application/Order/Services/OrderService.cs
index dd04a7f..c256b39 100644
--- a/src/Znyc.Dispatching.Application/Order/Services/OrderService.cs
+++ b/src/Znyc.Dispatching.Application/Order/Services/OrderService.cs
@@ -499,7 +499,7 @@ namespace Znyc.Dispatching.Application
             }
             constructionId = assign.ConstructionId;
             //施工单位是否存在，不存在新增，返回工程信息
-            if (assign.ConstructionName.IsNotEmptyOrNull())
+            if (assign.ConstructionName.Trim().IsNotEmptyOrNull())
             {
                 constructionId = await GetConstructionId(assign.ConstructionId, assign.ConstructionName);
             }
@@ -1525,7 +1525,6 @@ namespace Znyc.Dispatching.Application
 
                         await ReceiveAsync(id);
                     }
-
                 }
 
                 var orderOutput = new OrderOutput();
diff --git a/src/Znyc.Dispatching.Core/Util/MiniProgramUtil.cs b/src/Znyc.Dispatching.Core/Util/MiniProgramUtil.cs
index a566e85..5ab8008 100644
--- a/src/Znyc.Dispatching.Core/Util/MiniProgramUtil.cs
+++ b/src/Znyc.Dispatching.Core/Util/MiniProgramUtil.cs
@@ -37,20 +37,29 @@ namespace Znyc.Dispatching.Core.Util
         private static string BasicAESDecrypt(string encryptedDataStr, string session_key, string iv)
         {
 
-            var databyte = System.Text.Encoding.Default.GetBytes(encryptedDataStr);
-            // 16进制转换成byte
-            var encryptedData = Convert.FromBase64String(encryptedDataStr.Replace(" ", ""));
-            var managed = new RijndaelManaged
+            try
             {
-                Key = Convert.FromBase64String(session_key),
-                IV = Convert.FromBase64String(iv),
-                Mode = CipherMode.CBC,
-                Padding = PaddingMode.PKCS7
-            };
-            var transform = managed.CreateDecryptor();
-            var finalBlock = transform.TransformFinalBlock(encryptedData, 0, encryptedData.Length);
-            var result = Encoding.Default.GetString(finalBlock);
-            return result;
+                var databyte = System.Text.Encoding.Default.GetBytes(encryptedDataStr);
+                // 16进制转换成byte
+                var encryptedData = Convert.FromBase64String(encryptedDataStr.Replace(" ", ""));
+                var managed = new RijndaelManaged
+                {
+                    Key = Convert.FromBase64String(session_key),
+                    IV = Convert.FromBase64String(iv),
+                    Mode = CipherMode.CBC,
+                    Padding = PaddingMode.PKCS7
+                };
+                var transform = managed.CreateDecryptor();
+                var finalBlock = transform.TransformFinalBlock(encryptedData, 0, encryptedData.Length);
+                var result = Encoding.Default.GetString(finalBlock);
+                return result;
+            }
+            catch (Exception ex)
+            {
+
+                throw new Exception(ex.Message);
+            }
+            
         }