From 9ca96199d92168fe221dda9aba56f55520a561d8 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期二, 29 十月 2024 17:30:59 +0800
Subject: [PATCH] 1
---
WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs b/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs
index ee6f4d9..8f68362 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs
@@ -40,7 +40,7 @@
List<string> cacheDicNos = new List<string>();
foreach (string n in dicNos)
{
- string str = _cacheService.Get(n);
+ string? str = _cacheService.Get(n);
if (!string.IsNullOrEmpty(str))
{
VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);
@@ -54,13 +54,32 @@
}
if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
{
- List<VueDictionaryDTO> selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x))).Select(s => new VueDictionaryDTO
+ List<string> list = dicNos.Where(x => !cacheDicNos.Contains(x)).ToList();
+ List<Sys_Dictionary> dictionaries = BaseDal.GetDictionaries(list).ToList();
+
+ List<VueDictionaryDTO> selectDics = dictionaries.Select(s => new VueDictionaryDTO
{
DicNo = s.DicNo,
Config = s.Config,
//dbSql = s.Sql,
Data = s.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName })
}).ToList();
+
+ foreach (var v in dictionaries)
+ {
+ if (!string.IsNullOrEmpty(v.DBSql))
+ {
+ VueDictionaryDTO? temp = selectDics.FirstOrDefault(x => x.DicNo == v.DicNo);
+ if (temp != null)
+ selectDics.Remove(temp);
+ selectDics.Add(new VueDictionaryDTO
+ {
+ Config = v.Config,
+ DicNo = v.DicNo,
+ Data = BaseDal.QueryDynamicDataBySql(v.DBSql)
+ });
+ }
+ }
foreach (var item in selectDics)
{
@@ -87,10 +106,10 @@
// Data = GetSourceData(item.dicNo, item.dbSql, item.list)
//}).ToList();
-
+
return vueDictionaryDTOs;
}
-
+
}
}
--
Gitblit v1.9.3