From ee1f970db6e7dccc76d180c792091dcfc5c97ee3 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Wed, 11 Mar 2020 20:42:55 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=81=20MyDatabase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Models/external_employee/external_employeeService.cs | 3 ++- Utils/MyDatabase.cs | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Models/external_employee/external_employeeService.cs b/Models/external_employee/external_employeeService.cs index 91160bf..5b564ca 100644 --- a/Models/external_employee/external_employeeService.cs +++ b/Models/external_employee/external_employeeService.cs @@ -80,7 +80,8 @@ left join public.{0}DepartmentData{0} as orgdata on orgdata.id = he.department_i left join public.hrm_employee_types as het on het.id = he.employee_type_id left join public.users as u on u.employee_id = he.employee_id where he.workingstatus = 'สถานะปฏิบัติงาน' and he.deleted_at is null and mpn.deleted_at is null -and opd.deleted_at is null and htm.deleted_at is null; +and opd.deleted_at is null and htm.deleted_at is null +order by he.firstname,he.lastname; ", '"'.ToString()); var para = db.GetParameterListNpgsql(); DataTable dt = db.ExecuteDataTableNpgsql(sql, para); diff --git a/Utils/MyDatabase.cs b/Utils/MyDatabase.cs index 464e28e..09c7761 100644 --- a/Utils/MyDatabase.cs +++ b/Utils/MyDatabase.cs @@ -22,7 +22,16 @@ namespace TTSW.Utils public DataTable ExecuteDataTableNpgsql(string queryString, List para) { System.Data.DataSet ds = new DataSet(); - string connectionString = Configuration.GetConnectionString("externalDBConnectionString"); + + var DB_HOST = Environment.GetEnvironmentVariable("DB_HOST"); + var DB_PORT = Environment.GetEnvironmentVariable("DB_PORT"); + var DB_NAME = Environment.GetEnvironmentVariable("DB_NAME"); + var DB_USERNAME = Environment.GetEnvironmentVariable("DB_USERNAME"); + var DB_PASSWORD = Environment.GetEnvironmentVariable("DB_PASSWORD"); + + var envConnectionString = $"Server={DB_HOST};Port={DB_PORT};Database={DB_NAME};User ID={DB_USERNAME};Password={DB_PASSWORD};"; + + string connectionString = !string.IsNullOrEmpty(DB_HOST) ? envConnectionString : Configuration.GetConnectionString("externalDBConnectionString"); using (NpgsqlConnection conn = new NpgsqlConnection(connectionString)) using (NpgsqlCommand cmd = new NpgsqlCommand(queryString, conn))