From e2a05a6c91f1b94bef8ecea7de7bf149d7e77c89 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 18 十月 2024 15:05:29 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs"
index dd04635..a235134 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_DictionaryRepository.cs"
@@ -13,8 +13,11 @@
{
public class Sys_DictionaryRepository : RepositoryBase<Sys_Dictionary>, ISys_DictionaryRepository
{
+
+
public Sys_DictionaryRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
{
+
}
/// <summary>
@@ -25,14 +28,14 @@
/// <returns></returns>
public IEnumerable<Sys_Dictionary> GetDictionaries(IEnumerable<string> dicNos, bool executeSql = true)
{
- List<Sys_Dictionary> Dictionaries = GetAllDictionary();
+ List<Sys_Dictionary> Dictionaries = GetDictionaries(dicNos.ToList());
- foreach (var item in Dictionaries.Where(x => dicNos.Contains(x.DicNo)))
+ foreach (var item in Dictionaries)
{
if (executeSql)
{
// 2020.05.01澧炲姞鏍规嵁鐢ㄦ埛淇℃伅鍔犺浇瀛楀吀鏁版嵁婧恠ql
- string sql = item.DBSql;
+ string sql = item.Sql;
if (!string.IsNullOrEmpty(sql))
{
item.DicList = Query(sql);
@@ -49,8 +52,8 @@
{
return base.QueryDynamicDataBySql(sql, null).Select(s => new Sys_DictionaryList()
{
- DicName = s.Value,
- DicValue = s.Key.ToString()
+ DicName = s.value,
+ DicValue = s.key.ToString()
}).ToList();
}
catch (Exception ex)
@@ -59,6 +62,13 @@
}
}
+ private List<Sys_Dictionary> GetDictionaries(List<string> dicNos)
+ {
+ //base.QueryData().ToList();
+ List<Sys_Dictionary> _dictionaries = Db.Queryable<Sys_Dictionary>().Where(x => x.Enable == 1 && dicNos.Contains(x.DicNo)).Includes(x => x.DicList).ToList();
+ return _dictionaries;
+ }
+
private List<Sys_Dictionary> GetAllDictionary()
{
//base.QueryData().ToList();
--
Gitblit v1.9.3