From da9e7db35959750f4162ac85899acdf648acd10d Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 27 Feb 2024 12:44:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=20userNos=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Services/Implements/DevicePermissionService.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index 7575648b..8a5579f4 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -71,7 +71,7 @@ public class DevicePermissionService : IDevicePermissionService
         var nextUserNos = await GetPermissionUserNosAsync();
         if (nextUserNos.Any())
         {
-            userNos = nextUserNos;
+            userNos = userNos.Concat(nextUserNos).Distinct().ToList();
         }
 
         var currentDic = await GetAssignDeviceCodesInternalAsync(userNos);
@@ -79,6 +79,7 @@ public class DevicePermissionService : IDevicePermissionService
         var deivces = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
         foreach (var userNo in userNos)
         {
+
             beforeDic.TryGetValue(userNo, out var beforeCodes);
             beforeCodes ??= new List<Guid>();
 
@@ -100,7 +101,6 @@ public class DevicePermissionService : IDevicePermissionService
             addItems = addItems.Where(x => deviceCodes.Contains(x)).ToList();
 
             var userInfo = await _dbContext.Queryable<GainfoEntity>()
-              .LeftJoin<DepartmentEntity>((ga, department) => department.No == ga.DepartmentNo)
               .Where(ga => ga.No == userNo)
               .Select(ga => new
               {