From a4dfeed293c89b634c63b146d2f9f335e8533da7 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Tue, 26 Dec 2023 14:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=94=9F=E4=BA=A7=E9=A2=86=E9=80=80?=
 =?UTF-8?q?=E6=96=99=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CurrentUserExtensions.cs                      | 15 ++++++---------
 .../UnplannedIssueRequestForDongyangAppService.cs |  5 +++--
 ...nplannedReceiptRequestForDongyangAppService.cs |  5 +++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/CurrentUserExtensions.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/CurrentUserExtensions.cs
index abcbf8563..23f5de017 100644
--- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/CurrentUserExtensions.cs
+++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/CurrentUserExtensions.cs
@@ -6,19 +6,16 @@ public static class CurrentUserExtensions
 {
     public static string GetUserName(this ICurrentUser currentUser)
     {
-        if (currentUser == null || currentUser.Name == null) //仅调试时用
-        {
-            return "admin";
-        }
         return currentUser.Name;
     }
 
     public static string GetName(this ICurrentUser currentUser)
-    {
-        if (currentUser == null || currentUser.Name == null) //仅调试时用
-        {
-            return "admin";
-        }
+    {    
         return currentUser.Name;
     }
+    public static string GetUserName_New(this ICurrentUser currentUser)
+    {
+        return currentUser.UserName;
+    }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
index 3cd37ad65..8d459cc10 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
@@ -287,7 +287,8 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
     /// <returns></returns>
     private async Task SetEntityPropertiesAsync(UnplannedIssueRequest entity)
     {
-        var userName = CurrentUser.GetUserName();
+        var userName = CurrentUser.GetUserName_New();
+        var name = CurrentUser.GetName();
         if (userName != null)
         {
             var department = await _departmentApp.GetByUsernameAsync(userName).ConfigureAwait(false);
@@ -298,7 +299,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
                 entity.DeptName = department.Name;
             }
 
-            entity.Worker = userName;
+            entity.Worker = name;
             entity.CreatorId = CurrentUser.Id;
         }
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
index dfdaa344f..a553d4dee 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
@@ -238,7 +238,8 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
     /// <returns></returns>
     private async Task SetEntityPropertiesAsync(UnplannedReceiptRequest entity)
     {
-        var userName = CurrentUser.GetUserName();
+        var userName = CurrentUser.GetUserName_New();
+        var name = CurrentUser.GetName();
         if (userName != null)
         {
             var department = await _departmentApp.GetByUsernameAsync(userName).ConfigureAwait(false);
@@ -249,7 +250,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
                 entity.DeptName = department.Name;
             }
             entity.CreatorId = CurrentUser.Id;
-            entity.Worker = userName;
+            entity.Worker = name;
         }
 
         entity.BuildDate = DateTime.Now;