From 7316e17d3c2c5ce0c1f06a891a741cb624bb2258 Mon Sep 17 00:00:00 2001
From: wintel <yubaolee@163.com>
Date: Wed, 26 Feb 2025 07:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B5=81=E7=A8=8B=E9=80=9A=E7=9F=A5=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/UserManager/UserManagerApp.cs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/OpenAuth.App/UserManager/UserManagerApp.cs b/OpenAuth.App/UserManager/UserManagerApp.cs
index 4f3a0ee7..4444396b 100644
--- a/OpenAuth.App/UserManager/UserManagerApp.cs
+++ b/OpenAuth.App/UserManager/UserManagerApp.cs
@@ -324,29 +324,31 @@ namespace OpenAuth.App
         {
             var sql = $@"
             select u.*
-            from `USER` u
+            from sysuser u
                      join (select distinct SecondId as UserId
                            from Relevance
-                           where `Key` = '{Define.INSTANCE_NOTICE_USER}'
+                           where `key` = '{Define.INSTANCE_NOTICE_USER}'
                              and FirstId = '{instanceId}'
                            union
                            select distinct FirstId as UserId
                            from Relevance a
                                     inner join (select SecondId as RoleId
                                                 from Relevance
-                                                where `Key` = '{Define.INSTANCE_NOTICE_ROLE}'
+                                                where `key` = '{Define.INSTANCE_NOTICE_ROLE}'
                                                   and FirstId = '{instanceId}') b on a.SecondId = b.RoleId
-                           where `Key` = 'UserRole') userids on u.Id = userids.UserId";
+                           where `key` = 'UserRole') userids on u.Id = userids.UserId";
 
             if (UnitWork.GetDbContext().Database.GetDbConnection().GetType().Name == "SqlConnection")
             {
-                sql = sql.Replace(" `USER` ", " [USER] ");
-                sql = sql.Replace("`Key`", "[Key]");
+                sql = sql.Replace("`key`", "[Key]");
             }
             else if (UnitWork.GetDbContext().Database.GetDbConnection().GetType().Name == "OracleConnection")
             {
-                sql = sql.Replace(" `USER` ", " \"USER\" ");
-                sql = sql.Replace("`Key`", "\"Key\"");
+                sql = sql.Replace("`key`", "\"KEY\"");
+            }
+            else if (UnitWork.GetDbContext().Database.GetDbConnection().GetType().Name == "NpgsqlConnection")
+            {
+                sql = sql.Replace("`key`", "\"key\"");
             }
             
             var users = UnitWork.FromSql<SysUser>(sql);