From e3127924723960f2bf23a6bdb5dd7a40346b3862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=9F=E5=96=9C=E6=97=BA?= <zhongxiwnag@foxmail.com>
Date: Sat, 27 Jul 2024 10:11:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4dto=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/TrackNode/TrackNodeInput.cs                 |  6 +++---
 .../AutoMapper/TrackNodeMapperProfile.cs             |  6 +++---
 .../Services/TrackNode/TrackNodeService.cs           | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

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
     /// <summary>
     /// 系统id
     /// </summary>
-    public int SystemId { get; set; }
+    public int? SubSystemId { get; set; }
     
     /// <summary>
     /// 节点名称
     /// </summary>
-    public string Name { get; set; }
+    public string? NodeName { get; set; }
     
     /// <summary>
     /// 节点英文名称
     /// </summary>
-    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<QueryTrackNodeRequest, TrackNodePageDto>();
         CreateMap<EditTrackNodeInput, TrackNodeEntity>(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<UnifyResultDto> 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);