演出列表修改

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/MongoMerchantUtils.java

@@ -279,7 +279,8 @@ public class MongoMerchantUtils {
             performanceIdList = permissionVoList.stream().map(MerchantAuthorizationPerformanceVo::getPerformanceId).collect(Collectors.toList());
         }
         //查询演出
-        Criteria criteria = performanceIdList == null ? Criteria.where("performancesId").ne(null) : Criteria.where("performancesId").in(performanceIdList);
+        Criteria criteriaPerformanceId = performanceIdList == null ? Criteria.where("performancesId").ne(null) : Criteria.where("performancesId").in(performanceIdList);
+        Criteria criteria = Criteria.where("performancesId").ne(null);
         if (performancePartnerListParam.getTitle() != null && !performancePartnerListParam.getTitle().isEmpty()) {
             criteria = criteria.and("title").regex(".*" + performancePartnerListParam.getTitle() + ".*");
         }
@@ -291,13 +292,12 @@ public class MongoMerchantUtils {
                     criteria = criteria.and("appStatus").is(performancePartnerListParam.getStatus());
                 }
                 if (performancePartnerListParam.getTimeStart() != null && !performancePartnerListParam.getTimeStart().isEmpty()) {
-                    criteria = criteria.and("timeStart").gte(performancePartnerListParam.getTimeStart()).and("timeStart").lte(performancePartnerListParam.getTimeEnd());
+                    criteria = criteria.and("timeStart").gte(performancePartnerListParam.getTimeStart()).lte(performancePartnerListParam.getTimeEnd());
                 }
             }
         }
         List<KylinPerformanceVo> performanceVos = mongoTemplate.find(
-                Query.query(new Criteria().orOperator(criteria, Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId()))).with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())),
-//                Query.query(criteria.orOperator(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())),
                 KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
         //查询销量
         Aggregation aggregation = Aggregation.newAggregation(