This commit is contained in:
86182
2022-10-29 14:53:01 +08:00
parent ab1ba34d9d
commit 48ee954169

View File

@@ -124,7 +124,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
builder.addFilter(FieldFilters.eq("sysCreateAid",aid)); builder.addFilter(FieldFilters.eq("sysCreateAid",aid));
builder.setPageIndex(pageIndex); builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize); builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("sysCreateTime")); builder.addOrder(OrderCondition.desc("id"));
if(StringUtils.isNotBlank(keyWord)){ if(StringUtils.isNotBlank(keyWord)){
builder.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE,keyWord)); builder.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE,keyWord));
} }
@@ -424,7 +424,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType"); query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType");
query.setPageIndex(pageIndex); query.setPageIndex(pageIndex);
query.setPageSize(pageSize); query.setPageSize(pageSize);
query.addOrder(OrderCondition.desc("f.sysCreateTime")); query.addOrder(OrderCondition.desc("f.id"));
query.addFilter(FieldFilters.eqField("f.objId","c.id")); query.addFilter(FieldFilters.eqField("f.objId","c.id"));
query.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Course.value())); query.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Course.value()));
//查询用户自己的课程收藏, //查询用户自己的课程收藏,
@@ -492,7 +492,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder query=QueryBuilder.from(from); QueryBuilder query=QueryBuilder.from(from);
query.setPageIndex(pageIndex); query.setPageIndex(pageIndex);
query.setPageSize(pageSize); query.setPageSize(pageSize);
query.addOrder(OrderCondition.desc("f.sysCreateTime")); query.addOrder(OrderCondition.desc("f.id"));
query.addFilter(FieldFilters.eqField("f.objId","q.id")); query.addFilter(FieldFilters.eqField("f.objId","q.id"));
query.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.QA.value())); query.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.QA.value()));
//查询用户自己的问答收藏, //查询用户自己的问答收藏,
@@ -570,7 +570,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder builder=QueryBuilder.from(from); QueryBuilder builder=QueryBuilder.from(from);
builder.setPageIndex(pageIndex); builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize); builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("f.sysCreateTime")); builder.addOrder(OrderCondition.desc("f.id"));
builder.addFilter(FieldFilters.eq("f.objId","a.id")); builder.addFilter(FieldFilters.eq("f.objId","a.id"));
builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Answer.value())); builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Answer.value()));
builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid)); builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid));
@@ -621,7 +621,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder builder = QueryBuilder.from(from); QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex); builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize); builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("f.sysCreateTime")); builder.addOrder(OrderCondition.desc("f.id"));
builder.addFilter(FieldFilters.eqField("f.objId","c.id")); builder.addFilter(FieldFilters.eqField("f.objId","c.id"));
builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Case.value())); builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Case.value()));
builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid)); builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid));
@@ -666,7 +666,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder builder = QueryBuilder.from(from); QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex); builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize); builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("f.sysCreateTime")); builder.addOrder(OrderCondition.desc("f.id"));
builder.addFilter(FieldFilters.eqField("f.objId","a.id")); builder.addFilter(FieldFilters.eqField("f.objId","a.id"));
builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Article.value())); builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Article.value()));
builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid)); builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid));