From 13e69c09c5ac97e0294d64617dfb934e34bb4264 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 17:11:13 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Service/HStation.Service.Assets.Core/05-service/07-ThreeLink/01-ThreeLinkMain/ThreeLinkManage_Instance.cs |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/05-service/07-ThreeLink/01-ThreeLinkMain/ThreeLinkManage_Instance.cs b/Service/HStation.Service.Assets.Core/05-service/07-ThreeLink/01-ThreeLinkMain/ThreeLinkManage_Instance.cs
index a996d33..f68cd60 100644
--- a/Service/HStation.Service.Assets.Core/05-service/07-ThreeLink/01-ThreeLinkMain/ThreeLinkManage_Instance.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/07-ThreeLink/01-ThreeLinkMain/ThreeLinkManage_Instance.cs
@@ -8,7 +8,9 @@
             if (entity == null)
                 return default;
             var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsThreelinkMain, Model.AssetsThreelinkMain>()
-             .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToList(src.KeyWord)))
+            .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras)))
+            .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags)))
+            .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToList(src.KeyWord)))
             ).CreateMapper();
             var model = mapper.Map<Entity.AssetsThreelinkMain, Model.AssetsThreelinkMain>(entity);
             return model;
@@ -20,7 +22,9 @@
             if (entities == null || entities.Count < 1)
                 return default;
             var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsThreelinkMain, Model.AssetsThreelinkMain>()
-          .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToList(src.KeyWord)))
+            .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras)))
+            .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags)))
+            .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToList(src.KeyWord)))
             ).CreateMapper();
             var models = mapper.Map<List<Entity.AssetsThreelinkMain>, List<Model.AssetsThreelinkMain>>(entities);
             return models;
@@ -32,6 +36,8 @@
             if (model == null)
                 return default;
             var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsThreelinkMain, Entity.AssetsThreelinkMain>()
+            .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras)))
+            .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
             .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord)))
             ).CreateMapper();
             var entity = mapper.Map<Model.AssetsThreelinkMain, Entity.AssetsThreelinkMain>(model);
@@ -44,6 +50,8 @@
             if (models == null || models.Count < 1)
                 return default;
             var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsThreelinkMain, Entity.AssetsThreelinkMain>()
+            .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras)))
+            .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
             .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord)))
             ).CreateMapper();
             var entities = mapper.Map<List<Model.AssetsThreelinkMain>, List<Entity.AssetsThreelinkMain>>(models);
@@ -56,6 +64,8 @@
             if (model == null || entity == null)
                 return;
             var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsThreelinkMain, Entity.AssetsThreelinkMain>()
+            .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras)))
+            .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
             .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord)))
              ).CreateMapper();
             mapper.Map(model, entity);

--
Gitblit v1.9.3