AR获取数据接口

只保留 参加该活动或者没参加活动的数据

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -1523,8 +1523,8 @@ public class GoblinMongoUtils {
         GoblinSelfMarketingVo showVo = showVoList.get(0);
 
         //只保留 参加该活动或者没参加活动的数据
-        for (GoblinGoodsInfoVo vo :baseData){
-            if(vo.getMarketId().equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(showVo.getSelfMarketId())) || vo.getMarketId().equals("")){
+        for (GoblinGoodsInfoVo vo : baseData) {
+            if (vo.getMarketId() == null || vo.getMarketId().equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(showVo.getSelfMarketId())) || vo.getMarketId().equals("")) {
                 returnData.add(vo);
             }
         }