Merge branch 'master' of http://git.fwt.com/Hotline/hotline

src/Hotline.Api/Controllers/SysController.cs

@@ -276,17 +276,7 @@ namespace Hotline.Api.Controllers
         [HttpGet("dictdata-type")]
         public async Task<List<SysDicData>> GetSysDicData([FromQuery] GetSysDicDataDto dto)
         {
-            //var (total, items) = await _sysDicDataRepository.QueryPagedAsync(
-            //    x=> true,
-            //    x=>x.OrderByDescending(d=>d.CreationTime),
-            //    dto.PageIndex,
-            //    dto.PageSize,
-            //    false,
-            //    whereIfs: (true, x => x.DicTypeId == dto.typeid)
-            //    );
             return await _sysDicDataRepository.Queryable().Where(x => x.DicTypeId == dto.typeid).WhereIF(!string.IsNullOrEmpty(dto.datavalue),x=>x.DicDataValue.Contains(dto.datavalue)).ToTreeAsync(x=>x.children,x=>x.ParentId,"");
-            //return await _sysDicDataRepository.Queryable().Where(x => x.DicTypeId == typeid).ToListAsync();
-            //return new PagedDto<SysDicData> { Total = total, Items = items };
         }
 
         /// <summary>
@@ -299,7 +289,7 @@ namespace Hotline.Api.Controllers
         {
             return await _sysDicDataRepository.Queryable().Where(x => x.DicTypeCode == code).ToListAsync();
         }
-
+         
         /// <summary>
         /// 获取字典对象
         /// </summary>