From 3f1e6f32441c98015e3e32a2a93a4d1bca364506 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 20 Jun 2022 17:19:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E5=88=86=E9=85=8D=E5=A1=AB=E5=86=99=E4=BA=BA?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8B=E5=8F=91=E6=94=B6=E9=9B=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95id=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 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 af78bfab8..522bf3835 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
@@ -1025,12 +1025,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	@Override
 	public boolean updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
-				|| StringUtils.isEmpty(paramsCollectManifestVO.getDre()) || StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())) {
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getDre())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
 			throw new JeroBootException("参数不能为空！");
 		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String dre = paramsCollectManifestVO.getDre();
 		String projectId = paramsCollectManifestVO.getProjectId();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
 		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1052,8 +1054,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		SysUser sysUser = sysUserService.getUserByName(dre);
 		String[] thirdIds = new String[1];
 		thirdIds[0] = sysUser.getThirdId();
-		String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
-		String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
+		String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
+		String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
 		String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
 		String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " please enter " + href + " to handle it.";
 		// 发送系统消息
@@ -1080,11 +1082,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
-		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
 			throw new JeroBootException("参数不能为空！");
 		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String projectId = paramsCollectManifestVO.getProjectId();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
 		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1117,8 +1121,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			SysUser sysUser = sysUserService.getUserByName(sdt);
 			String[] thirdIds = new String[1];
 			thirdIds[0] = sysUser.getThirdId();
-			String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
-			String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
+			String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
+			String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
 			String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
 
 			// 发送系统消息