diff --git a/Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs b/Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs index 0c16c523..c13fd0be 100644 --- a/Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs +++ b/Src/Dlhis.Basic/Device/Request/DeviceSaveRequest.cs @@ -83,9 +83,9 @@ public class DeviceSaveRequest : IValidatableObject yield return new ValidationResult($"{DeviceTypeEnumType.Door.GetDescription()}才可设置作为考勤设备", new[] { nameof(AsAttendance) }); } - if (HeartbeatInterval != 0 && HeartbeatInterval < 30) + if (HeartbeatInterval < 0) { - yield return new ValidationResult("心跳间隔需要设置>=30秒", new[] { nameof(HeartbeatInterval) }); + yield return new ValidationResult("心跳间隔不可小于0", new[] { nameof(HeartbeatInterval) }); } } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 1565dd45..346ad05f 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -126,10 +126,14 @@ public class DeviceService : IDeviceService var item = request[i]; await SaveAsync(item); - var registry = await _dbContext.Queryable().Where(x => x.DeviceUniqueNo == item.UniqueNo).FirstAsync(); - businessPlaces.Any(x => x.Code == item.BusinessPlaceCode).ThrowIfFalse("营业点不存在"); - registry.BusinessPlaceCode = item.BusinessPlaceCode; - await _dbContext.UpdateAsync(registry); + if (item.Type == DeviceTypeEnumType.Meal) + { + + var registry = await _dbContext.Queryable().Where(x => x.DeviceUniqueNo == item.UniqueNo).FirstAsync(); + businessPlaces.Any(x => x.Code == item.BusinessPlaceCode).ThrowIfFalse("营业点不存在"); + registry.BusinessPlaceCode = item.BusinessPlaceCode; + await _dbContext.UpdateAsync(registry); + } } catch (Exception ex) { @@ -269,7 +273,7 @@ public class DeviceService : IDeviceService _dbContext.Client.QueryFilter.Restore(); } } - + public async Task> GetAttendanceDevicesAsync() { diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs index cac38ce0..6bb69669 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs @@ -7,6 +7,8 @@ namespace Dlhis.Basic.Organization.Response; public class GainfoPageResponse { + public long Id { get; set; } + public string No { get; set; } ///