diff --git a/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java b/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java
index 5b7ea7d612..916e506f04 100644
--- a/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java
+++ b/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java
@@ -15,7 +15,7 @@ public class Db2Configuration extends JdbcConfiguration {
     public String getJdbc() {
         if(StringUtils.isEmpty(extraParams.trim())){
             if (StringUtils.isEmpty(getSchema())) {
-                return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;"
+                return "jdbc:db2://HOSTNAME:PORT/DATABASE"
                         .replace("HOSTNAME", getHost().trim())
                         .replace("PORT", getPort().toString().trim())
                         .replace("DATABASE", getDataBase().trim());
diff --git a/core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java b/core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java
index ca2471844e..bd39533183 100644
--- a/core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java
+++ b/core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java
@@ -11,14 +11,22 @@ public class PgConfiguration extends JdbcConfiguration {
 
     private String driver = "org.postgresql.Driver";
     private String extraParams = "";
+
     public String getJdbc() {
-        if(StringUtils.isEmpty(extraParams.trim())){
-            return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?currentSchema=SCHEMA"
-                    .replace("HOSTNAME", getHost().trim())
-                    .replace("PORT", getPort().toString().trim())
-                    .replace("DATABASE", getDataBase().trim())
-                    .replace("SCHEMA", getSchema().trim());
-        }else {
+        if (StringUtils.isEmpty(extraParams.trim())) {
+            if (StringUtils.isEmpty(getSchema())) {
+                return "jdbc:postgresql://HOSTNAME:PORT/DATABASE"
+                        .replace("HOSTNAME", getHost().trim())
+                        .replace("PORT", getPort().toString().trim())
+                        .replace("DATABASE", getDataBase().trim());
+            } else {
+                return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?currentSchema=SCHEMA"
+                        .replace("HOSTNAME", getHost().trim())
+                        .replace("PORT", getPort().toString().trim())
+                        .replace("DATABASE", getDataBase().trim())
+                        .replace("SCHEMA", getSchema().trim());
+            }
+        } else {
             return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
                     .replace("HOSTNAME", getHost().trim())
                     .replace("PORT", getPort().toString().trim())