From d9b7e80dec78216c74e033ae0d258ac81d380dd0 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Fri, 8 Mar 2024 17:59:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AF=BC=E4=BC=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Basic/Device/Request/ImportDeviceSaveRequest.cs | 6 +++---
 .../Device/Services/Implements/DeviceService.cs           | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Request/ImportDeviceSaveRequest.cs b/Src/Dlhis.Basic/Device/Request/ImportDeviceSaveRequest.cs
index 83a4fca9..3db51eb0 100644
--- a/Src/Dlhis.Basic/Device/Request/ImportDeviceSaveRequest.cs
+++ b/Src/Dlhis.Basic/Device/Request/ImportDeviceSaveRequest.cs
@@ -33,7 +33,7 @@ namespace Dlhis.Basic.Device.Request
         /// <summary>
         /// 心跳间隔
         /// </summary>
-        public int HeartbeatInterval { get; set; }
+        public int HeartbeatInterval { get; set; } = 0;
 
         /// <summary>
         /// 部署点
@@ -58,12 +58,12 @@ namespace Dlhis.Basic.Device.Request
         /// <summary>
         /// 是否启用
         /// </summary>
-        public bool Enable { get; set; }
+        public bool Enable { get; set; } = false;
 
         /// <summary>
         /// 是否作为考勤设备
         /// </summary>
-        public bool AsAttendance { get; set; }
+        public bool AsAttendance { get; set; } = false;
 
         /// <summary>
         /// 营业点code
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index 3cdfabe0..50b1e7ea 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -134,8 +134,14 @@ public class DeviceService : IDeviceService
         var lst = request.Imports;
         var places = await _dbContext.Queryable<BusinessPlaceEntity>().ToListAsync();
 
-        foreach (var form in lst)
+        for (int i = 0; i < lst.Count; i++)
         {
+            var form = lst[i];
+            if (form.UniqueNo.IsEmpty())
+            {
+                errs.Add($"第{i+1}条的第一列的设备唯一码不能缺少！");
+                continue;
+            }
             if (form.PlaceeCode != null)
             {
                 var place = places.Where(x => x.Code == form.PlaceeCode).FirstOrDefault();