记得上下班打卡 | git大法好,push需谨慎

Commit 3837a853 authored by 胡佳晨's avatar 胡佳晨

分页提交

parent b75e08e6
...@@ -273,9 +273,9 @@ public class MongoSlimeUtils { ...@@ -273,9 +273,9 @@ public class MongoSlimeUtils {
SlimeAuthorizationConst.PerformancePermission.EDIT.getId(), SlimeAuthorizationConst.PerformancePermission.EDIT.getId(),
// SlimeAuthorizationConst.PerformancePermission.SALES.getId(), // SlimeAuthorizationConst.PerformancePermission.SALES.getId(),
SlimeAuthorizationConst.PerformancePermission.LINE.getId()) SlimeAuthorizationConst.PerformancePermission.LINE.getId())
) ),
.skip(((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize())) // .skip(((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize()))
.limit(performancePartnerListParam.getSize()), // .limit(performancePartnerListParam.getSize()),
SlimeAuthorizationPerformanceVo.class, SlimeAuthorizationPerformanceVo.class.getSimpleName()); SlimeAuthorizationPerformanceVo.class, SlimeAuthorizationPerformanceVo.class.getSimpleName());
performanceIdList = permissionVoList.stream().map(SlimeAuthorizationPerformanceVo::getPerformanceId).collect(Collectors.toList()); performanceIdList = permissionVoList.stream().map(SlimeAuthorizationPerformanceVo::getPerformanceId).collect(Collectors.toList());
} }
...@@ -298,7 +298,10 @@ public class MongoSlimeUtils { ...@@ -298,7 +298,10 @@ public class MongoSlimeUtils {
} }
} }
List<KylinPerformanceVo> performanceVos = mongoTemplate.find( List<KylinPerformanceVo> performanceVos = mongoTemplate.find(
Query.query(new Criteria().andOperator(criteria).orOperator(criteriaPerformanceId, Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId()))).with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())), Query.query(new Criteria().andOperator(criteria).orOperator(criteriaPerformanceId, Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId())))
.with(Sort.by(orderBy, performancePartnerListParam.getOrderItem()))
.skip(((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize()))
.limit(performancePartnerListParam.getSize()),
KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
//查询销量 //查询销量
Aggregation aggregation = Aggregation.newAggregation( Aggregation aggregation = Aggregation.newAggregation(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment