柜子内部搜索

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java

@@ -148,6 +148,11 @@ public class ArchivesAutoVO extends ArchivesAuto {
 	 */
 	private Integer isSelect;
 
+	/**
+	 * 柜子内部搜索
+	 */
+	private String innerSearch;
+
 	@ApiModelProperty("批量保存")
 	private List<ArchivesAutoVO> list;
 	/**

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -184,10 +184,24 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//根据单位查询出当前箱子所有档案，最大为160条
 		List<ArchivesAutoVO> archivesAutos = baseMapper.pageByArchivesAuto3(page, vo);
 		//根据条件筛选
+		if (vo.getInnerSearch() != null){
+			vo.setQueryValue(vo.getInnerSearch());
+			vo.setSearchType(1);
+			vo.setStorageTimes(null);
+			vo.setSecretLevels(null);
+			vo.setCarrierTypes(null);
+			vo.setYears(null);
+			vo.setMonths(null);
+		}
 		List<ArchivesAutoVO> selectAutos = baseMapper.pageByArchivesAuto4(vo);
-		List<Long> ids = selectAutos.stream().map(l -> l.getId()).collect(Collectors.toList());
+		List<Long> ids = new ArrayList<>();
+		if (selectAutos != null && selectAutos.size() > 0) {
+			ids = selectAutos.stream().map(l -> l.getId()).collect(Collectors.toList());
+		}else {
+			ids.add(-1L);
+		}
 		if (archivesAutos != null && archivesAutos.size() >0) {
-			archivesAutos.stream().forEach(aa -> {
+			for (ArchivesAutoVO aa : archivesAutos) {
 				if (ids.contains(aa.getId())){
 					aa.setIsSelect(1);
 				}else {
@@ -199,7 +213,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				if (StringUtils.isNotBlank(aa.getSecretLevel())) {
 					aa.setSecretLevelValue("1".equals(aa.getSecretLevel()) ? "机密" : ("2".equals(aa.getSecretLevel()) ? "绝密" : "秘密"));
 				}
-			});
+			}
 			//格式
 			List<List<ArchivesAutoVO>> listList = CommonUtil.splitList(archivesAutos, 8);
 			//一页，所有格子