添加关键字查询

2022-05-31 11:31:43 +08:00
parent dbb25ed313
commit f8a1b396b9
6 changed files with 7 additions and 28 deletions
@@ -78,6 +78,8 @@ namespace IRaCIS.Application.Contracts

    public class BasicDicQuery:PageInput
    {
+        public string? keyInfo { get; set; }
+
        public string? Code { get; set; }


@@ -42,6 +42,9 @@ namespace IRaCIS.Application.Services

            var systemBasicDataQueryable = _dicRepository.Where(t => t.ParentId == null)
                .WhereIf(!string.IsNullOrEmpty(basicDicQuery.Code), t => t.Code.Contains(basicDicQuery.Code!))
+                .WhereIf(!string.IsNullOrEmpty(basicDicQuery.keyInfo), t => t.Description.Contains(basicDicQuery.keyInfo!) || t.Code.Contains(basicDicQuery.keyInfo!)
+                || t.ChildList.Any(u=>u.ValueCN.Contains(basicDicQuery.keyInfo!)) || t.ChildList.Any(u => u.Description.Contains(basicDicQuery.keyInfo!)))
+                
                .WhereIf(basicDicQuery.ConfigTypeId != null, t => t.ConfigTypeId == basicDicQuery.ConfigTypeId!)
                .WhereIf(basicDicQuery.DataTypeEnum != null, t => t.DataTypeEnum == basicDicQuery.DataTypeEnum)