|
@@ -197,7 +197,8 @@ public class PaperServiceImpl implements PaperService{
|
|
query.addCriteria(Criteria.where("course.level").is(paperSearchInfo.getLevel()));
|
|
query.addCriteria(Criteria.where("course.level").is(paperSearchInfo.getLevel()));
|
|
}
|
|
}
|
|
if(StringUtils.isNoneBlank(paperSearchInfo.getName())){
|
|
if(StringUtils.isNoneBlank(paperSearchInfo.getName())){
|
|
- query.addCriteria(Criteria.where("name").regex(".*?\\.*" +paperSearchInfo.getName() + ".*"));
|
|
|
|
|
|
+ String paperName = CommonUtils.escapeExprSpecialWord(paperSearchInfo.getName());
|
|
|
|
+ query.addCriteria(Criteria.where("name").regex(".*?\\.*" + paperName + ".*"));
|
|
}
|
|
}
|
|
long count = this.mongoTemplate.count(query, Paper.class);
|
|
long count = this.mongoTemplate.count(query, Paper.class);
|
|
query.with(new Sort(new Order(Direction.DESC,"createTime")));
|
|
query.with(new Sort(new Order(Direction.DESC,"createTime")));
|
|
@@ -331,7 +332,8 @@ public class PaperServiceImpl implements PaperService{
|
|
query.addCriteria(Criteria.where("course.code").is(paperSearchInfo.getCourseNo()));
|
|
query.addCriteria(Criteria.where("course.code").is(paperSearchInfo.getCourseNo()));
|
|
}
|
|
}
|
|
if(StringUtils.isNoneBlank(paperSearchInfo.getName())){
|
|
if(StringUtils.isNoneBlank(paperSearchInfo.getName())){
|
|
- query.addCriteria(Criteria.where("name").regex(".*?\\.*" +paperSearchInfo.getName() + ".*"));
|
|
|
|
|
|
+ String paperName = CommonUtils.escapeExprSpecialWord(paperSearchInfo.getName());
|
|
|
|
+ query.addCriteria(Criteria.where("name").regex(".*?\\.*" + paperName + ".*"));
|
|
}
|
|
}
|
|
if(StringUtils.isNotBlank(paperSearchInfo.getLevel())){
|
|
if(StringUtils.isNotBlank(paperSearchInfo.getLevel())){
|
|
query.addCriteria(Criteria.where("course.level").is(paperSearchInfo.getLevel()));
|
|
query.addCriteria(Criteria.where("course.level").is(paperSearchInfo.getLevel()));
|