From 72bab1219cbca2e53adb98dc9113ae1f85298cf8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 19 八月 2024 14:06:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
index adf0e3e..e4a6f13 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
@@ -164,7 +164,7 @@
@VciBusinessLog(operateName = "瀵煎嚭灞炴��")
public void exportAttributes(String exportFileName,String attrNames, HttpServletResponse response){
try {
- String excelPath = attributeService.exportAttributes(exportFileName,attrNames);
+ String excelPath = attributeService.exportAttributes(exportFileName,attrNames,false);
ControllerUtil.writeFileToResponse(response,excelPath);
} catch (Exception e) {
String msg = "瀵煎嚭鏋氫妇鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
@@ -214,7 +214,7 @@
try {
file.transferTo(new File(excelFileName));
if (file != null) {
- return attributeService.importAttributes(file1);
+ return attributeService.importAttributes(file1,false);
} else {
return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"鏃犲鍏ョ殑鏂囦欢"});
}
--
Gitblit v1.9.3