diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 2bd31a70d..37853567f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -59,6 +59,14 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { @Override public List> queryCondition(String flag, String cut, String searchFlag) { List> mapList = iBussDocumentLibraryEOService.queryCondition(flag, cut, searchFlag); + //搜索条件手动添加正文 + if("1".equals(searchFlag)){ + Map map = new HashMap<>(); + map.put("db_field_txt","正文"); + map.put("field_show_type","1"); + map.put("db_field_name","file_text"); + mapList.add(map); + } //type = 0时,查询下拉,树形,日期等字段 type = 1时,查询输入框字段 return mapList; } @@ -693,8 +701,26 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } int pageNo = Integer.parseInt(map.get("pageNo").toString()); int pageSize = Integer.parseInt(map.get("pageSize").toString()); + //判断第一次传参和第二次传参 inputFieldList + String selectValue = ""; + String selectValueTwo = ""; + for (Map.Entry entry : mapOne.entrySet()) { + String key = entry.getKey(); + String value = (String)entry.getValue(); + if(inputFieldList.contains(key) && StringUtils.isNotBlank(value)){ + selectValue = value; + } + } + for (Map.Entry entry : mapTwo.entrySet()) { + String key = entry.getKey(); + String value = (String)entry.getValue(); + if(inputFieldList.contains(key) && StringUtils.isNotBlank(value)){ + selectValueTwo = value; + } + } - IPage iPage = getiPage(null, null, must, pageNo, pageSize); + + IPage iPage = getiPage(selectValue, selectValueTwo, must, pageNo, pageSize); return iPage; }