460bug,商户达人

alien-store/src/main/java/shop/alien/store/service/impl/LifeGroupBuyServiceImpl.java

@@ -241,7 +241,15 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
                     List<EssentialHolidayComparison> essentialHolidayComparisons = essentialHolidayComparisonMapper.selectList(new LambdaQueryWrapper<EssentialHolidayComparison>().in(EssentialHolidayComparison::getId, list));
                     holiday = essentialHolidayComparisons.stream().map(EssentialHolidayComparison::getFestivalName).collect(Collectors.joining(","));
                 }
-                record.setDisableDateValueStr(valueList.get(0) + ";" + holiday);
+                if (StringUtils.isNotEmpty(valueList.get(0)) && StringUtils.isNotEmpty(holiday)) {
+                    record.setDisableDateValueStr(valueList.get(0) + ";" + holiday);
+                }
+                if (StringUtils.isEmpty(valueList.get(0))) {
+                    record.setDisableDateValueStr(holiday);
+                }
+                if (StringUtils.isEmpty(holiday)) {
+                    record.setDisableDateValueStr(valueList.get(0));
+                }
             }
         }
     }