jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java

@@ -44,10 +44,11 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
 		//获取条件id下的所有条件
 		List<OcrUsersearchchild>  list = ocrUsersearchchildService.selectByMainId(userSearchId);
 
-		SearchConditionVO vo = new SearchConditionVO();
 		List<SearchConditionVO> conditionVOList = new ArrayList<>();
 		for (OcrUsersearchchild ocrUsersearchchild : list) {
 
+			SearchConditionVO vo = new SearchConditionVO();
+
 			String searchfield = ocrUsersearchchild.getSearchfield();//解析对应字段
 
 			if(SearchConfigEnum.PROJECT.getId().equals(searchfield)){
@@ -108,8 +109,13 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
 			if(SearchConfigEnum.THREEWEEKdd.getId().equals(searchfield)){
 				vo.setIzYeardddd(ocrUsersearchchild.getSearchvalue());
 			}
+			conditionVOList.add(vo);
+		}
+
+		if(CollUtil.isEmpty(conditionVOList)){
+			return new SearchConditionVO();
 		}
-		return vo;
+		return conditionVOList.get(0);
 	}
 
 }