|
@@ -63,12 +63,11 @@ public class HceReviewServiceImpl extends AbstractCrudService<HceReviewMapper, H
|
|
|
IPage<HceReview> page = new Page<>(requestVO.getPageNum(),requestVO.getPageSize());
|
|
|
LambdaQueryWrapper<HceReview> queryWrapper = Wrappers.lambdaQuery();
|
|
|
if(StringUtils.isNotBlank(requestVO.getName())){
|
|
|
-// queryWrapper.and(wrap)
|
|
|
- }else{
|
|
|
-
|
|
|
+ queryWrapper.and(wrapper->wrapper.like(HceReview::getUserName,requestVO.getName()).or().like(HceReview::getNickName,requestVO.getName()));
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(requestVO.getStartTime())&&StringUtils.isNotBlank(requestVO.getEndTime()),HceReview::getCreateTime,requestVO.getStartTime(),requestVO.getEndTime())
|
|
|
+ .orderByDesc(HceReview::getId);
|
|
|
+ page = this.page(page,queryWrapper);
|
|
|
|
|
|
return new CommonPage<>(page.getRecords(),page.getTotal(),requestVO.getPageSize(),requestVO.getPageNum());
|
|
|
}
|