From 69fbaf281342f69272d4e97319105fae18beaf5a Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 4 Nov 2020 17:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4EF=E6=97=A0=E6=B3=95=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E7=9A=84StringComparison=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 5869097e51aa93760f8bd46adb87636c4c5dc094 Former-commit-id: 4205c39290fea45ff52bbda603a2ac69bab017fe --- .../Admin/Controllers/SettingController.cs | 6 +++--- .../Areas/Admin/Controlls/ApiController.cs | 11 +++++----- .../Admin/Controlls/CommandController.cs | 4 ++-- .../Areas/Admin/Controlls/DataController.cs | 13 ++++++------ .../Areas/Admin/Controlls/DeviceController.cs | 20 +++++++++---------- .../Areas/Admin/Controlls/NodeController.cs | 14 ++++++------- .../Admin/Controlls/ParameterController.cs | 7 +++---- .../Admin/Controlls/ProductController.cs | 9 ++++----- .../Areas/Admin/Controlls/SceneController.cs | 4 ++-- .../Admin/Controlls/SceneTiggerController.cs | 7 +++---- .../Admin/Controlls/SceneTimerController.cs | 4 ++-- .../Controlls/Users/PermissionController.cs | 6 +++--- .../Admin/Controlls/Users/RoleController.cs | 4 ++-- .../Admin/Controlls/Users/UserController.cs | 5 ++--- projects/IoTNode/Version.cs | 2 +- 15 files changed, 55 insertions(+), 61 deletions(-) diff --git a/projects/Infrastructure/Areas/Admin/Controllers/SettingController.cs b/projects/Infrastructure/Areas/Admin/Controllers/SettingController.cs index e2ca729d..cd08fa92 100644 --- a/projects/Infrastructure/Areas/Admin/Controllers/SettingController.cs +++ b/projects/Infrastructure/Areas/Admin/Controllers/SettingController.cs @@ -1,4 +1,4 @@ -using Infrastructure.Application; +using Infrastructure.Application; using Infrastructure.Application.Entites.Settings; using Infrastructure.Application.Models; using Infrastructure.Application.Services.Settings; @@ -30,9 +30,9 @@ namespace Infrastructure.Areas.Admin.Controllers throw new ArgumentNullException(nameof(model)); } - return query.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) + return query.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) .WhereIf(model.Query.Type.HasValue, o => o.Type == model.Query.Type.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value)) .OrderBy(o => o.Name); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/ApiController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/ApiController.cs index c497b810..2199ce93 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/ApiController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/ApiController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -7,7 +7,6 @@ using Infrastructure.Web.Mvc; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using System; using System.Linq; namespace IoT.Shared.Areas.Admin.Controlls @@ -33,10 +32,10 @@ namespace IoT.Shared.Areas.Admin.Controlls ViewData.SelectList(o => model.Query.ProductId, () => this._ajax.GetProductSelectList(model.Query.ProductId)); return query .WhereIf(model.Query.ProductId.HasValue, o => o.ProductId == model.Query.ProductId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Command), o => o.Command.Contains(model.Query.Command, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Method), o => o.Method.Contains(model.Query.Method, StringComparison.OrdinalIgnoreCase)); + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Command), o => o.Command.Contains(model.Query.Command)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Method), o => o.Method.Contains(model.Query.Method)); } public override void ToDisplayModel(Api entity, EditApiModel model) diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/CommandController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/CommandController.cs index 6da0dfbc..652ae27a 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/CommandController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/CommandController.cs @@ -44,8 +44,8 @@ namespace IoT.Shared.Areas.Admin.Controlls .WhereIf(model.Query.NodeId.HasValue, o => o.Device.NodeId == model.Query.NodeId.Value) .WhereIf(model.Query.DeviceId.HasValue, o => o.DeviceId == model.Query.DeviceId.Value) .WhereIf(model.Query.ApiId.HasValue, o => o.ApiId == model.Query.ApiId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.QueryString), o => o.QueryString.Contains(model.Query.QueryString, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) + .WhereIf(!string.IsNullOrEmpty(model.Query.QueryString), o => o.QueryString.Contains(model.Query.QueryString)) .WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value) .WhereIf(model.Query.Delay.HasValue, o => o.Delay == model.Query.Delay.Value); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs index 7494ab90..979829ed 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; -using NPOI.SS.Formula.Functions; using System; using System.Linq; using Vibrant.InfluxDB.Client; @@ -41,12 +40,12 @@ namespace IoT.Shared.Areas.Admin.Controlls ViewData.SelectList(o => model.Query.DeviceId, () => this._ajax.GetDeviceSelectList(model.Query.NodeId.Value, model.Query.DeviceId), model.Query.NodeId.HasValue); return query.WhereIf(model.Query.NodeId.HasValue, o => o.Device.NodeId == model.Query.NodeId.Value) .WhereIf(model.Query.DeviceId.HasValue, o => o.DeviceId == model.Query.DeviceId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Key), o => o.Key.Contains(model.Query.Key, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Key), o => o.Key.Contains(model.Query.Key)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value)) .WhereIf(model.Query.Type.HasValue, o => o.Type == model.Query.Type.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Unit), o => o.Unit.Contains(model.Query.Unit, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Unit), o => o.Unit.Contains(model.Query.Unit)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description)) .WhereIf(model.Query.Timestamp.HasValue, o => o.Timestamp == model.Query.Timestamp.Value) .WhereIf(model.Query.Hidden.HasValue, o => o.Hidden == model.Query.Hidden.Value); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/DeviceController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/DeviceController.cs index d22f6293..bbeb28fd 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/DeviceController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/DeviceController.cs @@ -43,16 +43,16 @@ namespace IoT.Shared.Areas.Admin.Controlls return query .WhereIf(model.Query.NodeId.HasValue, o => o.NodeId == model.Query.NodeId.Value) .WhereIf(model.Query.ProductId.HasValue, o => o.ProductId == model.Query.ProductId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.DisplayName), o => o.DisplayName.Contains(model.Query.DisplayName, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Gateway), o => o.Gateway.Contains(model.Query.Gateway, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Tag), o => o.Tag.Contains(model.Query.Tag, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Ip), o => o.Ip.Contains(model.Query.Ip, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.UserName), o => o.UserName.Contains(model.Query.UserName, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Password), o => o.Password.Contains(model.Query.Password, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Icon), o => o.Icon.Contains(model.Query.Icon, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.ConnectId), o => o.ConnectId.Contains(model.Query.ConnectId, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) + .WhereIf(!string.IsNullOrEmpty(model.Query.DisplayName), o => o.DisplayName.Contains(model.Query.DisplayName)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Gateway), o => o.Gateway.Contains(model.Query.Gateway)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Tag), o => o.Tag.Contains(model.Query.Tag)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Ip), o => o.Ip.Contains(model.Query.Ip)) + .WhereIf(!string.IsNullOrEmpty(model.Query.UserName), o => o.UserName.Contains(model.Query.UserName)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Password), o => o.Password.Contains(model.Query.Password)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Icon), o => o.Icon.Contains(model.Query.Icon)) + .WhereIf(!string.IsNullOrEmpty(model.Query.ConnectId), o => o.ConnectId.Contains(model.Query.ConnectId)) .WhereIf(model.Query.IsOnline.HasValue, o => o.IsOnline == model.Query.IsOnline.Value) .WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs index 651c59b7..ad143fd0 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs @@ -22,13 +22,13 @@ namespace IoT.Shared.Areas.Admin.Controlls public override IQueryable Query(PagedListModel model, IQueryable query) { return base.Query(model, query) - .WhereIf(!string.IsNullOrEmpty(model.Query.OrganName), o => o.OrganName.Contains(model.Query.OrganName, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.OrganNumber), o => o.OrganNumber.Contains(model.Query.OrganNumber, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.CategoryName), o => o.CategoryName.Contains(model.Query.CategoryName, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.CategoryNumber), o => o.CategoryNumber.Contains(model.Query.CategoryNumber, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Version), o => o.Version.Contains(model.Query.Version, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.OrganName), o => o.OrganName.Contains(model.Query.OrganName)) + .WhereIf(!string.IsNullOrEmpty(model.Query.OrganNumber), o => o.OrganNumber.Contains(model.Query.OrganNumber)) + .WhereIf(!string.IsNullOrEmpty(model.Query.CategoryName), o => o.CategoryName.Contains(model.Query.CategoryName)) + .WhereIf(!string.IsNullOrEmpty(model.Query.CategoryNumber), o => o.CategoryNumber.Contains(model.Query.CategoryNumber)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Version), o => o.Version.Contains(model.Query.Version)) .WhereIf(model.Query.IsOnline.HasValue, o => o.IsOnline == model.Query.IsOnline.Value) .WhereIf(model.Query.Hidden.HasValue, o => o.Hidden == model.Query.Hidden.Value); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs index 3bc94471..110d3035 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs @@ -7,7 +7,6 @@ using Infrastructure.Web.Mvc; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using System; using System.Linq; namespace IoT.Shared.Areas.Admin.Controlls @@ -34,9 +33,9 @@ namespace IoT.Shared.Areas.Admin.Controlls .WhereIf(model.Query.Required.HasValue, o => o.Required == model.Query.Required.Value) .WhereIf(model.Query.ProductId.HasValue, o => o.Api.ProductId == model.Query.ProductId.Value) .WhereIf(model.Query.ApiId.HasValue, o => o.ApiId == model.Query.ApiId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Type), o => o.Type.Contains(model.Query.Type, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Type), o => o.Type.Contains(model.Query.Type)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description)) .WhereIf(!string.IsNullOrEmpty(model.Query.Minimum), o => o.Minimum == model.Query.Minimum) .WhereIf(!string.IsNullOrEmpty(model.Query.Maxinum), o => o.Maxinum == model.Query.Maxinum); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs index 089ea197..d265cd1a 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs @@ -7,7 +7,6 @@ using Infrastructure.Web.Mvc; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using System; using System.Linq; namespace IoT.Shared.Areas.Admin.Controlls @@ -32,10 +31,10 @@ namespace IoT.Shared.Areas.Admin.Controlls { return base.Query(model, query) .WhereIf(model.Query.CategoryId.HasValue, o => o.CategoryId == model.Query.CategoryId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.ApiJson.Contains(model.Query.ApiJson, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path)) + .WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.ApiJson.Contains(model.Query.ApiJson)) .OrderBy(o => o.DisplayOrder); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/SceneController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/SceneController.cs index c31cc17e..d9bd56b9 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/SceneController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/SceneController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -34,7 +34,7 @@ namespace IoT.Shared.Areas.Admin.Controlls ViewData.SelectList(o => model.Query.NodeId, () => this._ajax.GetNodeSelectList(model.Query.NodeId)); return query.Where(o => o.NodeId != null) .WhereIf(model.Query.NodeId.HasValue, o => o.NodeId == model.Query.NodeId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) .WhereIf(model.Query.Hidden.HasValue, o => o.Hidden == model.Query.Hidden.Value) .OrderBy(o => o.DisplayOrder); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/SceneTiggerController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/SceneTiggerController.cs index 84117d73..bf9ca456 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/SceneTiggerController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/SceneTiggerController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -6,7 +6,6 @@ using Infrastructure.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using NPOI.SS.Formula.Functions; using System; using System.Linq; @@ -41,8 +40,8 @@ namespace IoT.Shared.Areas.Admin.Controlls .WhereIf(model.Query.SceneId.HasValue, o => o.SceneId == model.Query.SceneId) .WhereIf(model.Query.DeviceId.HasValue, o => o.Data.DeviceId == model.Query.DeviceId.Value) .WhereIf(model.Query.DataId.HasValue, o => o.DataId == model.Query.DataId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Condition), o => o.Condition.Contains(model.Query.Condition, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Condition), o => o.Condition.Contains(model.Query.Condition)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) .WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value) .OrderBy(o => o.SceneId); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/SceneTimerController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/SceneTimerController.cs index dda9ed01..5fc2f581 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/SceneTimerController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/SceneTimerController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -34,7 +34,7 @@ namespace IoT.Shared.Areas.Admin.Controlls return query.Where(o => o.Scene.NodeId != null) .WhereIf(model.Query.NodeId.HasValue, o => o.Scene.NodeId == model.Query.NodeId.Value) .WhereIf(model.Query.SceneId.HasValue, o => o.SceneId == model.Query.SceneId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) .WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/Users/PermissionController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/Users/PermissionController.cs index b63e1e79..7f5c19d6 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/Users/PermissionController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/Users/PermissionController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -40,8 +40,8 @@ namespace IoT.Shared.Areas.Admin.Controllers { return query .WhereIf(model.Query.CategoryId.HasValue, o => o.CategoryId == model.Query.CategoryId.Value) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) - .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number)) .OrderBy(o => o.CategoryId).ThenBy(o => o.Name); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/Users/RoleController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/Users/RoleController.cs index 661847ea..8fcc9ef0 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/Users/RoleController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/Users/RoleController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -33,7 +33,7 @@ namespace IoT.Shared.Areas.Admin.Controllers public override IQueryable Query(PagedListModel model, IQueryable query) { return base.Query(model, query) - .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) .OrderBy(o => o.Name); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/Users/UserController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/Users/UserController.cs index 05689a85..fd052037 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/Users/UserController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/Users/UserController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -7,7 +7,6 @@ using Infrastructure.Web.Mvc; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using System; using System.Linq; namespace IoT.Shared.Areas.Admin.Controllers @@ -32,7 +31,7 @@ namespace IoT.Shared.Areas.Admin.Controllers public override IQueryable Query(PagedListModel model, IQueryable query) { return base.Query(model, query) - .WhereIf(!string.IsNullOrEmpty(model.Query.UserName), o => o.UserName.Contains(model.Query.UserName, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.UserName), o => o.UserName.Contains(model.Query.UserName)) .OrderBy(o => o.UserName); } diff --git a/projects/IoTNode/Version.cs b/projects/IoTNode/Version.cs index f1022e1c..85792567 100644 --- a/projects/IoTNode/Version.cs +++ b/projects/IoTNode/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.20102103")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.20110101")] \ No newline at end of file