From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java
index 4ea0a54..ac6dbad 100644
--- a/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -72,6 +72,7 @@
@Override
public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ paramIn.put("userId", pd.getUserId());
Assert.hasKeyAndValue(paramIn, "importAdapt", "鏈寘鍚ā鏉�");
String importAdapt = paramIn.getString("importAdapt") + "DataCleaning";
@@ -82,6 +83,7 @@
}
try {
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ paramIn.put("storeId", result.getStoreId());
Workbook workbook = null; //宸ヤ綔绨�
//宸ヤ綔琛�
@@ -154,7 +156,7 @@
// todo 璋冪敤 瀵煎叆闃熷垪寮�濮嬪鍏�
flag = userImportDataV1InnerServiceSMOImpl.importExcelData(assetImportLogPo);
if (flag > 0) {
- return ResultVo.success();
+ return ResultVo.createResponseEntity(assetImportLogPo);
}
return ResultVo.error("瀵煎叆澶辫触");
}
--
Gitblit v1.8.0