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 /// /// 心跳间隔 /// - public int HeartbeatInterval { get; set; } + public int HeartbeatInterval { get; set; } = 0; /// /// 部署点 @@ -58,12 +58,12 @@ namespace Dlhis.Basic.Device.Request /// /// 是否启用 /// - public bool Enable { get; set; } + public bool Enable { get; set; } = false; /// /// 是否作为考勤设备 /// - public bool AsAttendance { get; set; } + public bool AsAttendance { get; set; } = false; /// /// 营业点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().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();