diff --git a/Tiobon.Core.Repository/BASE/BaseRepository.cs b/Tiobon.Core.Repository/BASE/BaseRepository.cs index 45494bd5..891b8ea4 100644 --- a/Tiobon.Core.Repository/BASE/BaseRepository.cs +++ b/Tiobon.Core.Repository/BASE/BaseRepository.cs @@ -473,9 +473,6 @@ namespace Tiobon.Core.Repository.Base var query = _db.Queryable(); string conditions = "1=1"; - - - foreach (JProperty jProperty in filter.jsonParam.Properties()) { var name = jProperty.Name; @@ -487,9 +484,21 @@ namespace Tiobon.Core.Repository.Base switch (jsonParam.operationKey) { case "Include": - conditions += $" AND {name} ='{jsonParam.columnValue}'"; + conditions += $" AND {name} LIKE '%{jsonParam.columnValue}%'"; break; case "NotInclude": + conditions += $" AND {name} NOT LIKE '%{jsonParam.columnValue}%'"; + break; + case "IsNull": + conditions += $" AND {name} IS NULL"; + break; + case "NotNull": + conditions += $" AND {name} IS NOT NULL"; + break; + case "Equal": + conditions += $" AND {name} ='{jsonParam.columnValue}'"; + break; + case "NotEqual": conditions += $" AND {name} !='{jsonParam.columnValue}'"; break; default: