Merge remote-tracking branch 'origin/develop_master' into develop_1

This commit is contained in:
yanyizhou
2021-08-27 09:04:55 +08:00
@@ -50,7 +50,8 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
list.like(StringUtils.isNotEmpty(category),"category",category)
.like(StringUtils.isNotEmpty(cname),"cname",cname)
.ge(start!=null,"start_time",start)
.le(end!=null,"end_time",end);
.le(end!=null,"end_time",end)
.orderByDesc("start_time");
Page<SarPublicIdea> page = new Page<>(p,size);
IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
System.out.println("总条数"+userIPage.getTotal());