From 272e14890929dd4142502b1ed6a1d12437521d8a Mon Sep 17 00:00:00 2001 From: jity7777 Date: Thu, 28 Apr 2022 06:32:10 +0000 Subject: [PATCH] =?UTF-8?q?{=EC=98=81=EB=82=A8=EC=86=8C=EC=8A=A4=20?= =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EA=B1=B4=20=EC=B6=94=EA=B0=80=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=20by=20=ED=83=9C=EC=97=B0}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/BO.csproj | 5 +++-- Base/Base.csproj | 1 + Base/Controller/BasePartialController.cs | 2 +- FO/FO.csproj | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/BO/BO.csproj b/BO/BO.csproj index 21374e2..607738f 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -98,8 +98,9 @@ - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.8\lib\net45\System.Net.Http.Formatting.dll + + False + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll diff --git a/Base/Base.csproj b/Base/Base.csproj index 9a44730..a2deec8 100644 --- a/Base/Base.csproj +++ b/Base/Base.csproj @@ -108,6 +108,7 @@ ..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll + False ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll diff --git a/Base/Controller/BasePartialController.cs b/Base/Controller/BasePartialController.cs index 24bdc3d..c38ead8 100644 --- a/Base/Controller/BasePartialController.cs +++ b/Base/Controller/BasePartialController.cs @@ -318,7 +318,7 @@ namespace NP.Base public System.Collections.Hashtable SetHash(NP.Model.VMBase vm, bool appendSearch = true) { vm.pagenum = vm.pagenum ?? 1; - vm.pagerowcount = vm.pagerowcount < 1 ? vm.isexceldown == 1 ? 100000 : PageRowCount : vm.pagerowcount; + vm.pagerowcount = vm.pagerowcount < 1 ? (vm.isexceldown == 1 ? 100000 : PageRowCount) : vm.pagerowcount; var rht = new System.Collections.Hashtable() { { "pagenum", vm.pagenum.Value }, { "pagerowsize", vm.pagerowcount } }; if (appendSearch) { diff --git a/FO/FO.csproj b/FO/FO.csproj index 654ea64..5a4ef06 100644 --- a/FO/FO.csproj +++ b/FO/FO.csproj @@ -91,8 +91,9 @@ - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + + False + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll