最新

huanghongfeng

21 小时以前 b7f53ba61fbc1844d7b92ff852762b140d46ab54

 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/Sys_DictionaryRepository.cs

@@ -23,22 +23,22 @@
        /// <param name="dicNos"></param>
        /// <param name="executeSql">鏄惁鎵ц鑷畾涔塻ql</param>
        /// <returns></returns>
        public IEnumerable<Sys_Dictionary> GetDictionaries(IEnumerable<string> dicNos, bool executeSql = true)
        public IEnumerable<Sys_Dictionary> GetDictionaries(IEnumerable<string> dicNos, bool executeSql = false)
        {
            List<Sys_Dictionary> Dictionaries = GetAllDictionary();
            List<Sys_Dictionary> Dictionaries = GetAllDictionary(dicNos);

            foreach (var item in Dictionaries.Where(x => dicNos.Contains(x.DicNo)))
            {
                if (executeSql)
                {
                    //  2020.05.01澧炲姞鏍规嵁鐢ㄦ埛淇℃伅鍔犺浇瀛楀吀鏁版嵁婧恠ql
                    string sql = item.DBSql;
                    if (!string.IsNullOrEmpty(sql))
                    {
                        item.DicList = Query(sql);
                    }
                }
            }
            //foreach (var item in Dictionaries.Where(x => dicNos.Contains(x.DicNo)))
            //{
            //    if (executeSql)
            //    {
            //        //  2020.05.01澧炲姞鏍规嵁鐢ㄦ埛淇℃伅鍔犺浇瀛楀吀鏁版嵁婧恠ql
            //        string sql = item.DBSql;
            //        if (!string.IsNullOrEmpty(sql))
            //        {
            //            item.DicList = Query(sql);
            //        }
            //    }
            //}

            return Dictionaries;
        }
@@ -59,10 +59,10 @@
            }
        }

        private List<Sys_Dictionary> GetAllDictionary()
        private List<Sys_Dictionary> GetAllDictionary(IEnumerable<string> dicNos)
        {
            //base.QueryData().ToList();
            List<Sys_Dictionary> _dictionaries = Db.Queryable<Sys_Dictionary>().Includes(x => x.DicList).Where(x => x.Enable == 1).ToList();
            List<Sys_Dictionary> _dictionaries = Db.Queryable<Sys_Dictionary>().Includes(x => x.DicList).Where(x => x.Enable == 1 && dicNos.Contains(x.DicNo)).ToList();
            return _dictionaries;
        }
    }