From 78571e57b90e3fe4fee9514b15d77c745fd75203 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Thu, 16 Jan 2025 11:58:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=B9=E6=8D=AE=E6=AF=94=E8=BE=83=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=80=89=E5=8F=96=E7=9A=84=E6=AF=94=E8=BE=83=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/ProvideServices/TrackService.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs index 7e8206f8..31ab4fcc 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs @@ -255,11 +255,8 @@ public partial class TrackService : ApplicationService, ITrackService } var extraDict = System.Text.Json.JsonSerializer.Deserialize>(y.Extra); - if (extraDict!.TryGetValue(input.CompareFields!, out var compareValue)) - { - //todo:需要修改JsonElement和object的逻辑 - return compareValue.Equals(input.CompareValue); - } + if (extraDict!.TryGetValue(input.CompareFields!, out var compareValueJsonElement)) + return TextJsonHelper.EqJsonElementAndObject(compareValueJsonElement, input.CompareValue); return false; }) @@ -378,12 +375,9 @@ public partial class TrackService : ApplicationService, ITrackService throw new BusinessException(message: "轨迹extra为空无法使用比较字段比较，请检查轨迹"); } - var extraDict = System.Text.Json.JsonSerializer.Deserialize>(y.Extra); - if (extraDict!.TryGetValue(input.CompareFields!, out var compareValue)) - { - //todo:需要修改JsonElement和object的逻辑 - return compareValue.Equals(input.CompareValue); - } + var extraDict = TextJsonHelper.DeserializeDictionary(y.Extra); + if (extraDict!.TryGetValue(input.CompareFields!, out var compareValueJsonElement)) + return TextJsonHelper.EqJsonElementAndObject(compareValueJsonElement, input.CompareValue); return false; })