diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs
index 8e313589..d487c033 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackNode/TrackNodeInput.cs
@@ -15,15 +15,15 @@ public class EditTrackNodeInput
///
/// 系统id
///
- public int SystemId { get; set; }
+ public int? SubSystemId { get; set; }
///
/// 节点名称
///
- public string Name { get; set; }
+ public string? NodeName { get; set; }
///
/// 节点英文名称
///
- public string EnName { get; set; }
+ public string? NodeEnName { get; set; }
}
diff --git a/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs
index af8699e0..b2226591 100644
--- a/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs
+++ b/src/SJZY.Track.Application/AutoMapper/TrackNodeMapperProfile.cs
@@ -12,9 +12,9 @@ public class TrackNodeMapperProfile :Profile
{
CreateMap();
CreateMap(MemberList.None)
- .ForMember(val => val.NodeName, opt => opt.MapFrom(src => src.Name))
- .ForMember(val => val.NodeEnName, opt => opt.MapFrom(src => src.EnName))
- .ForMember(val => val.SubSystemId, opt => opt.MapFrom(src => src.SystemId));
+ .ForMember(val => val.NodeName, opt => opt.MapFrom(src => src.NodeName))
+ .ForMember(val => val.NodeEnName, opt => opt.MapFrom(src => src.NodeEnName))
+ .ForMember(val => val.SubSystemId, opt => opt.MapFrom(src => src.SubSystemId));
}
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs b/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs
index 76506271..c69ed6fd 100644
--- a/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs
+++ b/src/SJZY.Track.Application/Services/TrackNode/TrackNodeService.cs
@@ -86,15 +86,15 @@ namespace SJZY.Track.Application.Services.TrackNodeServices
{
#region 业务校验
var trackNodesEntitys = await _trackNodeRepository.GetListAsync(a =>
- a.SubSystemId == input.SystemId && (a.NodeName == input.Name || a.NodeEnName == input.EnName));
+ a.SubSystemId == input.SubSystemId && (a.NodeName == input.NodeName || a.NodeEnName == input.NodeEnName));
if (trackNodesEntitys.Any())
{
- var trackNodeName = trackNodesEntitys.FirstOrDefault(a => a.NodeName == input.Name);
+ var trackNodeName = trackNodesEntitys.FirstOrDefault(a => a.NodeName == input.NodeName);
if (trackNodeName != null)
{
throw new BusinessException(message: "该子系统下节点名称已存在");
}
- var trackNodeEnName = trackNodesEntitys.FirstOrDefault(a => a.NodeEnName == input.EnName);
+ var trackNodeEnName = trackNodesEntitys.FirstOrDefault(a => a.NodeEnName == input.NodeEnName);
if (trackNodeEnName != null)
{
throw new BusinessException(message: "该子系统下节点英文名称已存在");
@@ -120,8 +120,8 @@ namespace SJZY.Track.Application.Services.TrackNodeServices
#endregion
- trackNodesEntitys.NodeEnName = input.EnName;
- trackNodesEntitys.NodeName = input.Name;
+ trackNodesEntitys.NodeEnName = input.NodeEnName;
+ trackNodesEntitys.NodeName = input.NodeName;
var isTrue = await _trackNodeRepository.UpdateAsync(trackNodesEntitys);
return new UnifyResultDto("200", "修改成功", isTrue);
@@ -129,7 +129,7 @@ namespace SJZY.Track.Application.Services.TrackNodeServices
private async Task DeleteAsync(EditTrackNodeInput input)
{
- var trackStatus = await _trackStatusRepository.GetFirstAsync(val => val.Node == input.Id && val.SubSystemId == input.SystemId);
+ var trackStatus = await _trackStatusRepository.GetFirstAsync(val => val.Node == input.Id && val.SubSystemId == input.SubSystemId);
if(trackStatus!=null)
{
return new UnifyResultDto("200", "删除失败,该节点已被使用", false);