From bea497c3d34059ba1ddb8ed05fc6c36cabd44eb7 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 16:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9-?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=EF=BC=9A=E6=B7=BB=E5=8A=A0"=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98"=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   |  5 +++++
 .../impl/ParamsManifestEOServiceImpl.java     | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 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 112e02295..116df66f3 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
@@ -911,6 +911,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public List<Map<String, String>> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO, String cut) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
+			throw new JeroBootException("参数不能为空！");
+		}
+
 		String projectId = paramsCollectManifestVO.getProjectId();
 		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
@@ -1055,6 +1059,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, paramsManifestId)
+				.notIn(ParamsCollectManifestEO::getControlType, ControlTypeEnum.Title.getValue())
 				.orderByDesc(ParamsCollectManifestEO::getUpdateTime); // 按修改时间降序
 		List<ParamsCollectManifestEO> list = list(queryWrapper);
 		int collectFinishNumber = (int) list.stream().filter(e->CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count();
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 49a3b33ab..51fe947a7 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -23,6 +23,7 @@ import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
 import com.jero.modules.cert.report.service.IParamsReportEOService;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import com.jero.modules.cert.template.entity.ParamsTemplateEO;
+import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
 import com.jero.modules.cert.template.service.IParamsTemplateEOService;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
@@ -126,14 +127,16 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 			target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
 
 
-			// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
-			ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), source.getDutyTerritory());
-			if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
-				String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
-				if (StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
-					SysUser sysUser = sysUserService.getById(sdtId);
-					if (ObjectUtil.isNotEmpty(sysUser)) {
-						target.setSdt(sysUser.getUsername());
+			if (!ControlTypeEnum.Title.getValue().equals(source.getControlType())) {
+				// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+				ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), source.getDutyTerritory());
+				if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+					String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+					if (StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+						SysUser sysUser = sysUserService.getById(sdtId);
+						if (ObjectUtil.isNotEmpty(sysUser)) {
+							target.setSdt(sysUser.getUsername());
+						}
 					}
 				}
 			}