fix 修复已知问题
This commit is contained in:
@@ -34,14 +34,14 @@ public class BusinessTripEntity : SugarBaseEntity
|
||||
/// <summary>
|
||||
/// 开始时间
|
||||
/// </summary>
|
||||
[SugarColumn(IsNullable = false, ColumnDataType = "time")]
|
||||
public TimeOnly BeginDateTime { get; set; }
|
||||
[SugarColumn(IsNullable = true, ColumnDataType = "time")]
|
||||
public TimeOnly? BeginDateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结束时间
|
||||
/// </summary>
|
||||
[SugarColumn(IsNullable = false, ColumnDataType = "time")]
|
||||
public TimeOnly EndDateTime { get; set; }
|
||||
[SugarColumn(IsNullable = true, ColumnDataType = "time")]
|
||||
public TimeOnly? EndDateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 出差类型
|
||||
|
||||
@@ -41,13 +41,13 @@ public class SapBusinessTripInfoItem
|
||||
/// 开始时间
|
||||
/// </summary>
|
||||
[JsonProperty("OV_BEGUZ")]
|
||||
public TimeOnly BeginDateTime { get; set; }
|
||||
public TimeOnly? BeginDateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结束时间
|
||||
/// </summary>
|
||||
[JsonProperty("OV_ENDUZ")]
|
||||
public TimeOnly EndDateTime { get; set; }
|
||||
public TimeOnly? EndDateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 出差类型
|
||||
|
||||
@@ -95,4 +95,9 @@ public class DeviceTaskAssignmentResponse
|
||||
return LastHeartbeatTime.AddSeconds(HeartbeatInterval) < DateTime.Now;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
public int CreateBy { get; set; }
|
||||
}
|
||||
@@ -70,6 +70,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
|
||||
LastHeartbeatTime = deviceRegistry.LastHeartbeatTime,
|
||||
HeartbeatInterval = device.HeartbeatInterval,
|
||||
DeployPlace = device.DeployPlace,
|
||||
CreateBy = deviceTask.CreatedBy
|
||||
})
|
||||
.ToPageListAsync(request);
|
||||
|
||||
|
||||
@@ -143,7 +143,7 @@ public class MenuService : IMenuService
|
||||
if (!allCodes.Any())
|
||||
{
|
||||
//todo 管理员
|
||||
if (_currentUser.GetName() == "admin")
|
||||
if (_currentUser.GetIntSubjectId() == 1)
|
||||
{
|
||||
return await GetListAsync(PlatformEnumType.PCAdmin);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user