From 9cddee643aa4600917c673b6d01382079aa215d1 Mon Sep 17 00:00:00 2001 From: wintel Date: Sat, 9 Mar 2024 10:33:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=20#I95QYW=20pg=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E5=90=AF=E5=8A=A8=E6=97=B6=E6=8F=90=E7=A4=BA=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/Base/SqlSugarBaseApp.cs | 4 ++++ OpenAuth.App/Resources/ResourceApp.cs | 7 ++++++- OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs | 7 ++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/OpenAuth.App/Base/SqlSugarBaseApp.cs b/OpenAuth.App/Base/SqlSugarBaseApp.cs index 803eaf5f..2b6b4631 100644 --- a/OpenAuth.App/Base/SqlSugarBaseApp.cs +++ b/OpenAuth.App/Base/SqlSugarBaseApp.cs @@ -35,6 +35,10 @@ namespace OpenAuth.App public T Get(string id) { + if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL) + { + return SugarClient.Queryable().Where("\"Id\"=@id", new {id = id}).First(); + } return SugarClient.Queryable().Where("Id=@id", new {id = id}).First(); } diff --git a/OpenAuth.App/Resources/ResourceApp.cs b/OpenAuth.App/Resources/ResourceApp.cs index 36963655..965d0f69 100644 --- a/OpenAuth.App/Resources/ResourceApp.cs +++ b/OpenAuth.App/Resources/ResourceApp.cs @@ -84,7 +84,12 @@ namespace OpenAuth.App resources = resources.Where(u => u.AppId == request.appId); } - var propertyStr = string.Join(',', columnFields.Select(u => u.ColumnName)); + var columnnames = columnFields.Select(u => u.ColumnName); + if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL) + { + columnnames = columnFields.Select(u => "\"" + u.ColumnName +"\""); + } + var propertyStr = string.Join(',', columnnames); result.columnFields = columnFields; result.data = resources.OrderBy(u => u.TypeId) .Skip((request.page - 1) * request.limit) diff --git a/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs b/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs index 524050bf..30528d7b 100644 --- a/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs +++ b/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs @@ -40,7 +40,12 @@ namespace OpenAuth.App objs = objs.Where(u => u.Name.Contains(request.key)); } - var propertyStr = string.Join(',', columnFields.Select(u => u.ColumnName)); + var columnnames = columnFields.Select(u => u.ColumnName); + if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL) + { + columnnames = columnFields.Select(u => "\"" + u.ColumnName +"\""); + } + var propertyStr = string.Join(',', columnnames); result.columnFields = columnFields; result.data = objs.OrderByDescending(u => u.CreateTime) .Skip((request.page - 1) * request.limit)