From 1c782e2479c877ed8c2c1353bc8f9a08fc7b3b37 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 24 十二月 2024 19:50:01 +0800
Subject: [PATCH] 维保人员资质

---
 src/main/java/com/product/patch/service/PatchExportService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/product/patch/service/PatchExportService.java b/src/main/java/com/product/patch/service/PatchExportService.java
index 3276db7..04f54ad 100644
--- a/src/main/java/com/product/patch/service/PatchExportService.java
+++ b/src/main/java/com/product/patch/service/PatchExportService.java
@@ -200,7 +200,7 @@
 	public File exportTable(File dir, JSONArray tableInfoArr, Set<String> promptNameSet, Set<String> dictNameSet) {
 		DataTableEntity tableDte = getBaseDao().listTable(CoreConst.PRODUCT_SYS_DATAMODEL_TABLE, BaseUtil.buildQuestionMarkFilter("table_name", tableInfoArr.size(), true), tableInfoArr.stream().toArray(),
 				new Object[]{}, null, Integer.MAX_VALUE, 1, true);
-		return writeString(tableDte, "table_" + getDateTime(), dir);
+		return writeString(tableDte, "structure_" + getDateTime(), dir);
 	}
 
 	/**
@@ -246,6 +246,9 @@
 			}
 			File file = writeString(dte, "data_" + tableName + "_" + getDateTime(), dir);
 			fileList.add(file);
+		}
+		if(fileList.isEmpty()){
+			return null;
 		}
 
 		//鍘嬬缉鏂囦欢
@@ -340,7 +343,7 @@
 		Set<String> attachmentField = new HashSet<>();
 		for (int i = 0; i < fieldDte.getRows(); i++) {
 			String fieldType = fieldDte.getString(i, "field_type");
-			if (FieldType.FILE.equals(FieldType.getByDictValue(fieldType))) {
+			if (FieldType.FILE.equals(FieldType.getByDictValue(fieldType,false))) {
 				attachmentField.add(fieldDte.getString(i, "field_name"));
 			}
 		}

--
Gitblit v1.9.2