|
|
@@ -452,7 +452,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
|
|
|
item.setGradeNum(Long.valueOf(gradeGoods.size()));
|
|
|
gradeGoods.forEach(gradeGoodsItem -> {
|
|
|
ClassGrade grade = iClassGradeService.getById(gradeGoodsItem.getGradeId());
|
|
|
- if (ObjectUtils.isNotNull(grade.getClassStartTime()) || grade.getClassEndTime() < DateUtils.getNowTime()){
|
|
|
+ if (ObjectUtils.isNotNull(grade.getClassStartTime()) && grade.getClassEndTime() < DateUtils.getNowTime()){
|
|
|
return;
|
|
|
}
|
|
|
if (ObjectUtils.isNotNull(grade.getSevenCode())){
|