diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index e41696c0e..e68aeacb0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -326,6 +326,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return null;
 	}
 
+	private List<ParamsConfigDataEO> getConfigDataEOListByConfigIdAndCollectManifestId(String configId, String collectManifestId, List<ParamsConfigDataEO> paramsConfigDataEOList) {
+		List<ParamsConfigDataEO> configDataEOList = paramsConfigDataEOList.stream().filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList());
+		if (CollectionUtil.isNotEmpty(configDataEOList)) {
+			return configDataEOList;
+		}
+		return null;
+	}
+
     /**
 	 * 列表查询
 	 *
@@ -479,13 +487,24 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
 				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
-					Map<String, Object> configMap = new HashMap<>();
+					/*Map<String, Object> configMap = new HashMap<>();
 					String paramsConfigId = paramsConfigEO.getId();
-//					ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
 					ParamsConfigDataEO paramsConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
 					List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
 					configMap.put("controlType", controlType);
 					configMap.put("list", paramsConfigDataVOList);
+					manifestMap.put(paramsConfigEO.getId(), configMap);*/
+
+					Map<String,Object> paramsConfigDataVO = new HashMap<>();
+					Map<String, Object> configMap = new HashMap<>();
+					String paramsConfigId = paramsConfigEO.getId();
+					List<ParamsConfigDataEO> paramsConfigDatas = this.getConfigDataEOListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
+					for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDatas) {
+						List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
+						paramsConfigDataVO.put(paramsConfigDataEO.getId(),paramsConfigDataVOList);
+					}
+					configMap.put("controlType", controlType);
+					configMap.put("paramsConfigData", paramsConfigDataVO);
 					manifestMap.put(paramsConfigEO.getId(), configMap);
 
 					configIdList.add(paramsConfigEO.getId());