From 5b38f09a36a573dcdc3077a31a8ca6215d12a31f Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 7 Mar 2024 15:31:20 +0800
Subject: [PATCH] =?UTF-8?q?fix=20unique=E4=B8=BAnull=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs         | 5 -----
 Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs b/Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs
index 1308a9a2..f7e4a84c 100644
--- a/Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs
+++ b/Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs
@@ -78,11 +78,6 @@ public class DeviceSaveRequest : IValidatableObject
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        if (Id.HasValue)
-        {
-            UniqueNo = null;
-        }
-
         if (Type != DeviceTypeEnumType.Door && AsAttendance)
         {
             yield return new ValidationResult($"{DeviceTypeEnumType.Door.GetDescription()}才可设置作为考勤设备", new[] { nameof(AsAttendance) });
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index f43f3c7a..41d82124 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -204,7 +204,8 @@ public class DeviceService : IDeviceService
     /// <returns></returns>
     private async Task CheckUniqueNoExistsAsync(DeviceSaveRequest request)
     {
-        var exists = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == request.UniqueNo)
+        var exists = await _dbContext.Queryable<DeviceEntity>()
+              .Where(x => x.UniqueNo == request.UniqueNo)
               .WhereIF(request.Id.HasValue, x => x.Id != request.Id)
               .AnyAsync();