|
|
@@ -995,11 +995,14 @@ public class GroupRelationController {
|
|
|
if (renewSkuId != null) {
|
|
|
upgradeSkuIds.remove(renewSkuId);
|
|
|
}
|
|
|
- List<RenewUpgradePackageFrontView.RenewSkuView> renewSkuViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, builder
|
|
|
- .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitNum, minNum.get()).op(Operator.GreaterEqual)
|
|
|
- .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitTime, minTime.get()).op(LessEqual.class)
|
|
|
- .field(RenewUpgradePackageFrontView.RenewSkuView::getSkuId, upgradeSkuIds).op(Operator.InList)
|
|
|
- .build());
|
|
|
+ List<RenewUpgradePackageFrontView.RenewSkuView> renewSkuViews = null;
|
|
|
+ if (CollUtil.isNotEmpty(upgradeSkuIds)) {
|
|
|
+ renewSkuViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, builder
|
|
|
+ .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitNum, minNum.get()).op(Operator.GreaterEqual)
|
|
|
+ .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitTime, minTime.get()).op(LessEqual.class)
|
|
|
+ .field(RenewUpgradePackageFrontView.RenewSkuView::getSkuId, upgradeSkuIds).op(Operator.InList)
|
|
|
+ .build());
|
|
|
+ }
|
|
|
renew.setRenewSkus(renewSkuViews);
|
|
|
} catch (Exception e) {
|
|
|
}
|