From 1354b037f3c423530a72983b14a35cf5b6a7ac95 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Thu, 10 Oct 2024 15:54:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B0=20csv=20,=20=E5=BD=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=AD=E5=AD=98=E5=9C=A8=E9=80=97=E5=8F=B7=E6=97=B6?= =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E9=94=99=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chen/framework/console/dataview/DataView.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java index 53b33ee..8a3e774 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java @@ -14,6 +14,7 @@ import org.jumpserver.chen.framework.session.SessionManager; import org.jumpserver.chen.framework.ws.io.PacketIO; +import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; import java.sql.SQLException; @@ -125,6 +126,15 @@ private void fullData(SQLQueryResult result) { } } + private static void writeString(BufferedWriter writer, Object object) throws IOException { + var str = object.toString(); + + if (str.contains(",")) { + str = "\"" + str + "\""; + } + writer.write(str); + } + public void export(String scope) throws SQLException { var session = SessionManager.getCurrentSession(); @@ -144,7 +154,7 @@ public void export(String scope) throws SQLException { if (scope.equals("current")) { for (Field field : this.data.getFields()) { - writer.write(field.getName()); + writeString(writer, field.getName()); writer.write(","); } writer.newLine(); @@ -155,7 +165,7 @@ public void export(String scope) throws SQLException { writer.write("NULL"); writer.write(","); } else { - writer.write(row.get(field.getName()).toString()); + writeString(writer, row.get(field.getName())); writer.write(","); } }