rk
11 小时以前 b1dbef13075c3a6fea62e41db4cdcd7334e1e92b
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
@@ -187,7 +187,7 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
        }
        if ( StringUtils.isBlank(activity.getName())
                || StringUtils.isBlank(activity.getImgurl())
//                || StringUtils.isBlank(activity.getImgurl())
                || StringUtils.isBlank(activity.getContent())
                || activity.getLabelId()==null
                || activity.getBrandId()==null
@@ -1117,8 +1117,9 @@
                .eq(Activity::getStatus,Constants.ZERO)
                .eq(Objects.nonNull(model.getLabelId()),Activity::getLabelId,model.getLabelId())
                .eq(Objects.nonNull(model.getBrandId()),Activity::getBrandId,model.getBrandId())
                .like(StringUtils.isNotBlank(model.getInfo()),Activity::getContent,model.getInfo())
                .orderByDesc(Labels::getId)
                .and(StringUtils.isNotBlank(model.getInfo()),i->i.like(Activity::getContent,model.getInfo()).or()
                        .like(Activity::getName,model.getInfo()))
                .orderByDesc(Activity::getId)
        ;
        queryWrapper.orderByDesc(Activity::getCreateDate);
        IPage<Activity> activityIPage = activityJoinMapper.selectJoinPage(page, Activity.class, queryWrapper);