fix

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -941,18 +941,21 @@ public class GroupRelationController {
         List<RenewUpgradePackageFrontView> renewUpgradePackageFrontViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.class, MapUtils.builder().field(RenewUpgradePackageFrontView::getSkuId, skuId).build());
         renewUpgradePackageFrontViews.forEach(renew -> {
             try {
+                List<Long> upgradeSkuIds = Jsons.parseList(renew.getUpgradeSkuIds(), Long.class);
                 //年付展示
                 MapBuilder builder = MapUtils.builder();
                 if (minMonths.get() == 12) {
                     builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
-                    builder.field(RenewUpgradePackageFrontView.RenewSkuView::getSkuId, renewSkuId).op(Operator.NotEqual);
+                    if (renewSkuId != null) {
+                        upgradeSkuIds.remove(renewSkuId);
+                    }
                 } else {
                     builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterThan);
                 }
                 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, Jsons.parseList(renew.getUpgradeSkuIds(), Long.class)).op(Operator.InList)
+                        .field(RenewUpgradePackageFrontView.RenewSkuView::getSkuId, upgradeSkuIds).op(Operator.InList)
                         .build());
                 renew.setRenewSkus(renewSkuViews);
             } catch (Exception e) {