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 427714a5d2..13a67421c9 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
@@ -14,10 +14,11 @@ public class Db2Configuration extends JdbcConfiguration {
 
     public String getJdbc() {
         if(StringUtils.isEmpty(extraParams.trim())){
-            return "jdbc:db2://HOSTNAME:PORT/DATABASE"
+            return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;"
                     .replace("HOSTNAME", getHost().trim())
                     .replace("PORT", getPort().toString().trim())
-                    .replace("DATABASE", getDataBase().trim());
+                    .replace("DATABASE", getDataBase().trim()
+                    .replace("SCHEMA",getSchema().trim()));
         }else {
             return "jdbc:hive2://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
                     .replace("HOSTNAME", getHost().trim())
diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 1afc9432b3..63306c1af5 100644
--- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -2000,9 +2000,12 @@ public class ChartViewService {
 
     private List<ChartSeniorAssistDTO> getDynamicAssistFields(ChartViewDTO view) {
         String senior = view.getSenior();
+        List<ChartSeniorAssistDTO> list = new ArrayList<>();
+        if (StringUtils.isEmpty(senior)) {
+            return list;
+        }
         JSONObject jsonObject = JSONObject.parseObject(senior);
         JSONArray assistLine = jsonObject.getJSONArray("assistLine");
-        List<ChartSeniorAssistDTO> list = new ArrayList<>();
         if (ObjectUtils.isEmpty(assistLine) || StringUtils.isBlank(assistLine.toJSONString())) {
             return list;
         }