From 9191d1042cc98f2d168073ada978a72df47509f6 Mon Sep 17 00:00:00 2001
From: eli <xumengen_eli@online.com>
Date: Tue, 19 Nov 2024 16:57:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E5=91=98=E5=B7=A5=E5=A7=93=E5=90=8D=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/ProvideServices/TrackService.cs               | 6 +++++-
 .../Aggregates/OrderAggregate/IOrderRepository.cs          | 7 +++++++
 src/SJZY.Track.Repository/Repositories/OrderRepository.cs  | 5 +++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
index 5c20cc21..c9844221 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs
@@ -202,11 +202,15 @@ public partial class TrackService : ApplicationService, ITrackService
 
         // 删除轨迹
         var currentUser = CurrentUserRequest.CurrentUser;
+        var userName = userInfo.Data.UserName;
+        if (string.IsNullOrEmpty(userName))
+            userName = (await _orderRepository.GetUserById(currentUser.UserId))?.Name;
+
         var @event = new TrackDeleteEvent
         {
             EsIds = input.TrackContentEsIds.ToArray(),
             SubSystemId = tracks.First().SubSystemId,
-            OperationMan = currentUser.Name,
+            OperationMan = userName,
             OperationManId = currentUser.UserId
         };
         await _capPublisher.PublishAsync(GlobalConst.TrackDeleteSubscribe, @event);
diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
index ad8d9607..ae172fc0 100644
--- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
@@ -139,4 +139,11 @@ public interface IOrderRepository : IBasicRepository<OrderEntity>
     /// <param name="id"></param>
     /// <returns></returns>
     Task<VSystemEntity> GetSystemInfoById(int id);
+
+    /// <summary>
+    /// 根据id获取员工姓名
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<VUserEntity> GetUserById(int id);
 }
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index 5d427cab..727f17d6 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -184,6 +184,11 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
         return Context.Queryable<VSystemEntity>().FirstAsync(m => m.IsDeleted == false && m.Id == id);
     }
 
+    public Task<VUserEntity> GetUserById(int id)
+    {
+        return Context.Queryable<VUserEntity>().FirstAsync(m => m.IsDeleted == false && m.Id == id);
+    }
+
     private int UpdateOrderQuestionType(int questionType, IEnumerable<int> ids)
     {
         var idsString = string.Join(",", ids);