diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 7f0ef8e1..74721027 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -79,9 +79,7 @@ public class CasesServiceImpl implements ICasesService { } - if(caseVo.getExcellent()!=null){ - filters.add(FieldFilters.eq("excellent",caseVo.getExcellent())); - } + //增加只是查询有附件的 filters.add(FieldFilters.isNotNull("filePath")); @@ -138,9 +136,12 @@ public class CasesServiceImpl implements ICasesService { query.addOrder(OrderCondition.desc("isTop")); query.addOrder(OrderCondition.desc("topTime")); } - + //如果选择的是优秀案例,那么这里就按优秀案例的试试排序 + if(caseVo.getExcellent()!=null && caseVo.getExcellent()){ + filters.add(FieldFilters.eq("excellent",caseVo.getExcellent())); + } OrderCondition order=null; - if(StringUtils.isNotBlank(caseVo.getOrderField())) { + if(StringUtils.isNotBlank(caseVo.getOrderField())) { if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { order=OrderCondition.asc(caseVo.getOrderField()); }else { @@ -149,6 +150,8 @@ public class CasesServiceImpl implements ICasesService { }else { order=OrderCondition.desc("sysCreateTime"); } + + query.addFilters(filters); query.addOrder(order); query.setPageIndex(pageIndex);