经销商管理

doum

17 小时以前 6f846284806e47fac7c2a4a9658473f7f8e9945b

 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
@@ -1114,6 +1114,7 @@
                .selectAs(Labels::getParam,Activity::getParam)
                .leftJoin(Labels.class,Labels::getId,Activity::getLabelId)
                .eq(Activity::getIsdeleted,Constants.ZERO)
                .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())