From 70687e9ab543058185200488331b70f19ef9e6fb Mon Sep 17 00:00:00 2001
From: LILI <707464720@qq.com>
Date: Tue, 2 Apr 2024 12:29:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:1.=E5=9B=BE=E7=89=87=E6=9F=A5=E9=87=8D?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9D=A1=E4=BB=B6=E5=9B=9E=E5=86=99=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OcrUsersearchchildServiceImpl.java    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
index ad032b4e..e083dc30 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
@@ -44,11 +44,10 @@ 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)){
@@ -109,13 +108,8 @@ 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 conditionVOList.get(0);
+		return vo;
 	}
 
 }