From 32bb7e57dbae52ea864466a1e3ea1b83dcc2d0d7 Mon Sep 17 00:00:00 2001
From: zhaoqian <qian.zhao@fit2cloud.com>
Date: Fri, 18 Aug 2023 13:57:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:1.10.0=E7=89=88=E6=9C=AC=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=87=B31.18.9=EF=BC=8C=E6=95=B0=E6=8D=AE=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E5=90=8E=E9=83=A8=E5=88=86=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=20#5935?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/chart/ChartViewService.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 1afc9432b3..63306c1af5 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/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;
         }

From e1f44f9f5b5408417909bd6d98c11f0074e5839b Mon Sep 17 00:00:00 2001
From: qqfanga <fang_qq@outlook.com>
Date: Wed, 23 Aug 2023 17:33:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3SQL=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E7=9B=B4=E8=BF=9EDB2=E6=97=B6=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E5=86=99SQL=E5=BF=85=E9=A1=BB=E8=A6=81=E5=B8=A6schema=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/dto/datasource/Db2Configuration.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java b/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java
index 427714a5d2..13a67421c9 100644
--- a/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java
+++ b/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())