From bbaf7aa3be4566d5becbf6652f24eb5202c33f45 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 25 Nov 2024 11:40:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=AD=90=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/DeviceUploadLogService.cs      | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
index 1cbaa703..28574f46 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
@@ -23,8 +23,8 @@ public class DeviceUploadLogService : IDeviceUploadLogService
         _dbContext = dbContext;
         _currentUser = currentUser;
     }
-    
-     public async Task UploadLogsAsync(List<DeviceUploadLogUploadRequest> requests)
+
+    public async Task UploadLogsAsync(List<DeviceUploadLogUploadRequest> requests)
     {
         var deviceUniqueNos = requests.Select(x => x.DeviceUniqueNo).Distinct().ToList();
         var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceUniqueNos.Contains(x.UniqueNo)).ToListAsync();
@@ -151,7 +151,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
             _ => throw new UserFriendlyException("不支持当前设备类型")
         };
 
-        return await _dbContext.Queryable<DeviceUploadLogEntity>()
+        var r = await _dbContext.Queryable<DeviceUploadLogEntity>()
             .LeftJoin<DeviceEntity>((x, device) => x.DeviceUniqueNo == device.UniqueNo)
             .LeftJoin<GainfoEntity>((x, device, ga) => x.UserUniqueNo == ga.Code)
             .LeftJoin<OutsourceEntity>((x, device, ga, os) => x.UserUniqueNo == os.Code)
@@ -176,7 +176,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
                 OriginUserUniqueNo = x.UserUniqueNo,
                 OutsourceSupplier = os.Supplier,
                 SapUserCode = os.SapCode,
-                SapUserName = SqlFunc.Subqueryable<GainfoEntity>().Where(p => p.Code == os.SapCode).Select(p => p.Name),
+                //SapUserName = ,
                 DeviceUniqueNo = x.DeviceUniqueNo,
                 RaiseDateTime = x.RaiseDateTime,
                 CreateTime = x.CreateTime,
@@ -189,5 +189,20 @@ public class DeviceUploadLogService : IDeviceUploadLogService
                 Status = x.Status,
             })
             .ToPageListAsync(request);
+
+
+        var sapUserCodes = r.Data.Select(x => x.SapUserCode).Distinct().ToList();
+
+        var gainfos = await _dbContext.Queryable<GainfoEntity>().Where(x => sapUserCodes.Contains(x.Code)).Select(x => new { x.Code, x.Name }).ToListAsync();
+        foreach (var item in r.Data)
+        {
+            var s = gainfos.FirstOrDefault(x => x.Code == item.SapUserCode);
+            if (s != null)
+            {
+                item.SapUserName = s.Name;
+            }
+        }
+
+        return r;
     }
 }
\ No newline at end of file