From 2401ab2c4e106ba7d048beef9af8117b7e2542f8 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 5 Jul 2024 15:38:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implements/DevicePermissionService.cs   |  4 +++-
 .../Services/Implements/GainfoFaceService.cs         |  1 +
 .../Services/Implements/GainfoOutsourceService.cs    | 12 +++---------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index 849fe9a5..71f523ab 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -431,8 +431,10 @@ public class DevicePermissionService : IDevicePermissionService
             DeviceType = x.Type,
             UserNo = userNo,
             CancellationId = 0,
+            Priority = 0,
             Version = 0,
-            TenantId = x.TenantId
+            TenantId = x.TenantId,
+
         }).ToList();
 
         await _dbContext.InsertAsync(tasks);
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
index f7df00d8..be553662 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
@@ -54,6 +54,7 @@ public class GainfoFaceService : IGainfoFaceService
             .Where(x => x.Factory == request.Factory)
             .WhereIF(request.Exists.HasValue && request.Exists.Value, x => existsFaceCodes.Contains(x.Code))
             .WhereIF(request.Exists.HasValue && !request.Exists.Value, x => !existsFaceCodes.Contains(x.Code))
+            .WhereIF(request.Search.IsPresent(),x=>x.Code == request.Search)
             .Select((x, d) => new GainfoFacePageResponse
             {
                 UserCode = x.Code,
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs
index 42118ba2..21d18ab7 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs
@@ -1,8 +1,6 @@
-using Dlhis.Basic.Device.Services;
-using Dlhis.Basic.Organization.Request;
+using Dlhis.Basic.Organization.Request;
 using Dlhis.Basic.Organization.Response;
 using Dlhis.Entity.Basic.Entity;
-using Dlhis.Entity.Device.Enums;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
 using Kurisu.AspNetCore.Utils;
 using Kurisu.AspNetCore.Utils.Extensions;
@@ -15,13 +13,11 @@ public class GainfoOutsourceService : IGainfoOutsourceService
 {
     private readonly IDbContext _dbContext;
     private readonly RedisCache _redisCache;
-    private readonly IDevicePermissionService _devicePermissionService;
 
-    public GainfoOutsourceService(IDbContext dbContext, RedisCache redisCache, IDevicePermissionService devicePermissionService)
+    public GainfoOutsourceService(IDbContext dbContext, RedisCache redisCache)
     {
         _dbContext = dbContext;
         _redisCache = redisCache;
-        _devicePermissionService = devicePermissionService;
     }
 
     public async Task SaveAsync(GainfoOutsourceRequest request)
@@ -53,8 +49,6 @@ public class GainfoOutsourceService : IGainfoOutsourceService
                 SapCode = request.ExternalInfo.SapCode,
                 SapPhone = request.ExternalInfo.SapPhone
             });
-
-            await _devicePermissionService.GenerateDeviceTasksAsync(entity.No, DeviceTaskEnumType.Add);
         }
         else
         {
@@ -65,7 +59,7 @@ public class GainfoOutsourceService : IGainfoOutsourceService
             (outsource == null).ThrowIfTrue("不可编辑非外包人员档案数据");
 
             request.Adapt(entity);
-            outsource.Code = entity.Code;
+            outsource!.Code = entity.Code;
             request.ExternalInfo.Adapt(outsource);
 
             await _dbContext.UpdateAsync(entity);