From 86519d69fe02f609c94966b170903746880e76fd Mon Sep 17 00:00:00 2001 From: Master Date: Fri, 19 Jul 2024 18:24:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=20tagType=20=E4=B8=BA=20""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs b/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs index f1b0cf21..d7e4f13a 100644 --- a/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs +++ b/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs @@ -60,7 +60,7 @@ public class EnumToDictJob : IJob dictData.Code = enumData.Name; dictData.OrderNo = enumData.Value + 10; dictData.Name = enumData.Describe; - dictData.TagType = enumData.Theme; + dictData.TagType = enumData.Theme == "" ? enumData.Theme : "info"; uSysDictData.Add(dictData); } }); @@ -114,7 +114,7 @@ public class EnumToDictJob : IJob Code = u.Name, Remark = t2.Remark, OrderNo = u.Value + 10, - TagType = u.Theme ?? "info" + TagType = u.Theme == "" ? u.Theme : "info" }).ToList() }).ToList(); var iDictData = new List(); From b1c1d64973a50e8f6c0b4ae298ee1252bfdf23e0 Mon Sep 17 00:00:00 2001 From: Master Date: Fri, 19 Jul 2024 18:26:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=A0=E6=AD=A3=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs b/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs index d7e4f13a..a619fff2 100644 --- a/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs +++ b/Admin.NET/Admin.NET.Core/Job/EnumToDictJob.cs @@ -60,7 +60,7 @@ public class EnumToDictJob : IJob dictData.Code = enumData.Name; dictData.OrderNo = enumData.Value + 10; dictData.Name = enumData.Describe; - dictData.TagType = enumData.Theme == "" ? enumData.Theme : "info"; + dictData.TagType = enumData.Theme != "" ? enumData.Theme : "info"; uSysDictData.Add(dictData); } }); @@ -114,7 +114,7 @@ public class EnumToDictJob : IJob Code = u.Name, Remark = t2.Remark, OrderNo = u.Value + 10, - TagType = u.Theme == "" ? u.Theme : "info" + TagType = u.Theme != "" ? u.Theme : "info" }).ToList() }).ToList(); var iDictData = new List();