Merge remote-tracking branch 'origin/test' into test

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;
 	}
 
 }

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml

@@ -18,7 +18,7 @@
     <select id="selectsearch1" resultType="map">
 
 <!--        SELECT ID as id,packagename as name FROM ocr_packagetask WHERE create_by=#{userid} AND packagename like "%"#{search}"%"-->
-        SELECT id,name FROM ocr_task_package WHERE create_by=#{userid} AND name like "%"#{search}"%" AND tenant_id = #{tenantId}
+        SELECT id,name FROM ocr_task_package WHERE create_by=#{userid} AND name like "%"#{search}"%" AND tenant_id = #{tenantId} AND is_delete = 0
     </select>
 
     <select id="selectsearch2" resultType="map">