From 2715dd2b682f6ae7f6cea2dd4db48db60d1eb8a6 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Sun, 24 Jul 2022 17:22:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=94=B6=E9=9B=86=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA=20=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA=E8=A7=92=E8=89=B2=E5=8F=AA=E7=9C=8B?=
 =?UTF-8?q?=E5=88=B0=E8=87=AA=E5=B7=B1=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 29 +++++++++++++++++--
 .../collect/vo/ParamsCollectManifestVO.java   |  3 ++
 .../ParameterItemCollectionList.vue           |  6 ++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 50ebb976f..78ca3a4a4 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2157,8 +2157,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 //			os.close(); // 后开先关
 //			fis.close(); // 先开后关
 		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-			throw new JeroBootException("下载文件失败，请重试");
+			if (e instanceof JeroBootException){
+				throw new JeroBootException(e.getMessage());
+			} else {
+				log.error(e.getMessage(), e);
+				if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) {
+					throw new JeroBootException("Failed to download file, please try again");
+				} else {
+					throw new JeroBootException("下载文件失败，请重试");
+				}
+
+			}
 		} finally {
 //			IOUtils.closeQuietly(os);
 			IOUtils.closeQuietly(excelOS);
@@ -2250,10 +2259,26 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		Integer paramsTemplatePublishVersion = paramsCollectManifestVO.getParamsTemplatePublishVersion();
 		String cut = paramsCollectManifestVO.getCut();
 
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 		ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO();
 		queryEO.setParamsManifestId(paramsManifestId);
+
+		String userTypes = paramsCollectManifestVO.getUserTypes();
+		if (userTypes != null && CollectManifestUserTypeEnum.SDT.getValue().equals(userTypes)){
+			queryEO.setUserTypes(CollectManifestUserTypeEnum.SDT.getValue());
+			queryEO.setSdt(loginUser.getUsername());
+		}
+
 		List<Map<String, Object>> dataList = paramsCollectManifestEOMapper.listInfoForExport(queryEO); // 查询导出数据
+		if (dataList == null || dataList.isEmpty()){
+			// 没有查到数据，进行提示
+			if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) {
+				throw new JeroBootException("No data, unable to export");
+			} else {
+				throw new JeroBootException("无数据，无法导出");
+			}
+		}
 
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询所有配置列
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
index 1421ccb64..cc37935f7 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
@@ -74,4 +74,7 @@ public class ParamsCollectManifestVO {
 
     private String exportName; // 导出文件名
 
+    @ApiModelProperty(value = "用户类型")
+    private String userTypes; // 用户类型
+
 }
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index b1076e198..273116a1a 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -822,11 +822,13 @@
           paramsTemplateId: this.$route.query.paramsTemplateId,
           paramsTemplatePublishVersion:1,
           cut: this.cut,
+          userTypes: this.currentPersonRole,
           exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
         }
-        console.log(query)
         getAction('/params/collectManifest/exportAll', query).then((res) => {
-
+          if (res && !res.success) {
+            this.$message.error(res.message)
+          }
           this.textLoading = false
         })
       },