manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：值为null时导出的SQL语句使用null，而非空字符串

Browse Source
This commit is contained in:
暮光：城中城
2021-12-26 22:24:24 +08:00
parent 208826df62
commit 990c2379ff
10 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java
View File

@@ -87,10 +87,11 @@ public class BaseDownloadService implements DownloadService {
for (TableColumnDescDto dataCol : dataCols) {
if (values.length() > 0) values.append(", ");
Object val = item.get(dataCol.getName());
if (this.isNumber(dataCol.getType())) {
if (val == null) {
values.append("null");
} else if (this.isNumber(dataCol.getType())) {
values.append(val);
} else {
val = (val == null) ? "" : val;
val = val.toString().replaceAll("'", "''");
values.append("'").append(val).append("'");
}
@@ -121,20 +122,22 @@ public class BaseDownloadService implements DownloadService {
for (TableColumnDescDto dataCol : dataCols) {
Object val = item.get(dataCol.getName());
if (conditionSet.contains(dataCol.getName())) {
if (this.isNumber(dataCol.getType())) {
if (where.length() > 0) where.append(" and ");
if (where.length() > 0) where.append(" and ");
if (val == null) {
where.append(dataCol.getName()).append(" = null");
} else if (this.isNumber(dataCol.getType())) {
where.append(dataCol.getName()).append(" = ").append(val);
} else {
if (where.length() > 0) where.append(" and ");
where.append(dataCol.getName()).append(" = ").append("'").append(val).append("'");
}
} else {
if (values.length() > 0) values.append(", ");
values.append(dataCol.getName()).append("=");
if (this.isNumber(dataCol.getType())) {
if (val == null) {
values.append("null");
} else if (this.isNumber(dataCol.getType())) {
values.append(val);
} else {
val = (val == null) ? "" : val;
val = val.toString().replaceAll("'", "''");
values.append("'").append(val).append("'");
}

17
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java
View File

@@ -78,10 +78,11 @@ public class SqlserverDownloadService implements DownloadService {
for (TableColumnDescDto dataCol : dataCols) {
if (values.length() > 0) values.append(", ");
Object val = item.get(dataCol.getName());
if (this.isNumber(dataCol.getType())) {
if (val == null) {
values.append("null");
} else if (this.isNumber(dataCol.getType())) {
values.append(val);
} else {
val = (val == null) ? "" : val;
val = val.toString().replaceAll("'", "''");
values.append("'").append(val).append("'");
}
@@ -112,20 +113,22 @@ public class SqlserverDownloadService implements DownloadService {
for (TableColumnDescDto dataCol : dataCols) {
Object val = item.get(dataCol.getName());
if (conditionSet.contains(dataCol.getName())) {
if (this.isNumber(dataCol.getType())) {
if (where.length() > 0) where.append(" and ");
if (where.length() > 0) where.append(" and ");
if (val == null) {
where.append(dataCol.getName()).append(" = null");
} else if (this.isNumber(dataCol.getType())) {
where.append(dataCol.getName()).append(" = ").append(val);
} else {
if (where.length() > 0) where.append(" and ");
where.append(dataCol.getName()).append(" = ").append("'").append(val).append("'");
}
} else {
if (values.length() > 0) values.append(", ");
values.append(dataCol.getName()).append("=");
if (this.isNumber(dataCol.getType())) {
if (val == null) {
values.append("null");
} else if (this.isNumber(dataCol.getType())) {
values.append(val);
} else {
val = (val == null) ? "" : val;
val = val.toString().replaceAll("'", "''");
values.append("'").append(val).append("'");
}