dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into merge-sdk-plugin

Browse Source
This commit is contained in:
ulleo 2023-08-24 11:02:19 +08:00
commit b548a017ae
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java
View File

@ -14,10 +14,11 @@ public class Db2Configuration extends JdbcConfiguration {
public String getJdbc() { public String getJdbc() {
if(StringUtils.isEmpty(extraParams.trim())){ if(StringUtils.isEmpty(extraParams.trim())){
return "jdbc:db2://HOSTNAME:PORT/DATABASE" return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;"
.replace("HOSTNAME", getHost().trim()) .replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim()) .replace("PORT", getPort().toString().trim())
.replace("DATABASE", getDataBase().trim()); .replace("DATABASE", getDataBase().trim()
.replace("SCHEMA",getSchema().trim()));
}else { }else {
return "jdbc:hive2://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS" return "jdbc:hive2://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
.replace("HOSTNAME", getHost().trim()) .replace("HOSTNAME", getHost().trim())

5
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -2000,9 +2000,12 @@ public class ChartViewService {
private List<ChartSeniorAssistDTO> getDynamicAssistFields(ChartViewDTO view) { private List<ChartSeniorAssistDTO> getDynamicAssistFields(ChartViewDTO view) {
String senior = view.getSenior(); String senior = view.getSenior();
List<ChartSeniorAssistDTO> list = new ArrayList<>();
if (StringUtils.isEmpty(senior)) {
return list;
}
JSONObject jsonObject = JSONObject.parseObject(senior); JSONObject jsonObject = JSONObject.parseObject(senior);
JSONArray assistLine = jsonObject.getJSONArray("assistLine"); JSONArray assistLine = jsonObject.getJSONArray("assistLine");
List<ChartSeniorAssistDTO> list = new ArrayList<>();
if (ObjectUtils.isEmpty(assistLine) || StringUtils.isBlank(assistLine.toJSONString())) { if (ObjectUtils.isEmpty(assistLine) || StringUtils.isBlank(assistLine.toJSONString())) {
return list; return list;
} }