From 2f62412f96c949a56cd782582202ac63526b0947 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 18 Jul 2025 13:28:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0null=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implements/GainfoFaceService.cs  | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
index 806330ae..6a6a15d1 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
@@ -140,36 +140,6 @@ public class GainfoFaceService : IGainfoFaceService
 
         var face = await _faceDbContext.Queryable<GainfoFaceEntity>().Where(x => x.UserCode == gainfo.Code).SingleAsync();
 
-        if (gainfo.Type == GainfoUserTypeEnumType.External)
-        {
-            var faceSimilaritySetting = await _dbContext.Queryable<BasicTypeEntity>().Where(x => x.Type == "faceSimilarity").SingleAsync();
-            if (faceSimilaritySetting != null)
-            {
-                var faceSimilarity = await _hikService.GetSimilarityAsync(new GainfoFaceValidateRequest
-                {
-                    SrcFacePicBinaryData = face.Face,
-                    DistFacePicBinaryData = request.Face
-                });
-                var acceptSimilarity = faceSimilaritySetting.Code.Adapt<double>();
-
-                var isError = faceSimilarity < acceptSimilarity;
-                await _dbContext.InsertAsync(new HikValidateResultEntity
-                {
-                    UserCode = face.UserCode,
-                    Similarity = faceSimilarity,
-                    AcceptSimilarity = acceptSimilarity,
-                    CurrentFace = face.Face,
-                    UploadFace = request.Face,
-                    TenantId = gainfo.Factory,
-                });
-
-                if (isError)
-                {
-                    throw new UserFriendlyException($"系统检测非本人更新,请重试(相似度{faceSimilarity})");
-                }
-            }
-        }
-
         var taskType = face == null ? DeviceTaskEnumType.Add : DeviceTaskEnumType.Update;
         if (face == null)
         {
@@ -187,6 +157,36 @@ public class GainfoFaceService : IGainfoFaceService
         }
         else
         {
+            if (gainfo.Type == GainfoUserTypeEnumType.External)
+            {
+                var faceSimilaritySetting = await _dbContext.Queryable<BasicTypeEntity>().Where(x => x.Type == "faceSimilarity").SingleAsync();
+                if (faceSimilaritySetting != null)
+                {
+                    var faceSimilarity = await _hikService.GetSimilarityAsync(new GainfoFaceValidateRequest
+                    {
+                        SrcFacePicBinaryData = face.Face,
+                        DistFacePicBinaryData = request.Face
+                    });
+                    var acceptSimilarity = faceSimilaritySetting.Code.Adapt<double>();
+
+                    var isError = faceSimilarity < acceptSimilarity;
+                    await _dbContext.InsertAsync(new HikValidateResultEntity
+                    {
+                        UserCode = face.UserCode,
+                        Similarity = faceSimilarity,
+                        AcceptSimilarity = acceptSimilarity,
+                        CurrentFace = face.Face,
+                        UploadFace = request.Face,
+                        TenantId = gainfo.Factory,
+                    });
+
+                    if (isError)
+                    {
+                        throw new UserFriendlyException($"系统检测非本人更新,请重试(相似度{faceSimilarity})");
+                    }
+                }
+            }
+            
             face.Face = request.Face;
             face.ModifiedBy = 1;
             face.ModifiedTime = DateTime.Now;