diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java index a1b39a1fa..8d85e1065 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -137,9 +137,13 @@ public class WxCashBackActivityController extends BaseController { } } } - if (null == wxCashBackActivity.getMerchantList() || wxCashBackActivity.getMerchantList().size() <= 0 ) { - return new ResultData(Result.ERROR,"商户不能为空"); - } + if (null != wxCashBackActivity.getAllMerchant() && EnumYesOrNo.YES.getCode().intValue() == wxCashBackActivity.getAllMerchant().intValue()) { + + }else { + if (null == wxCashBackActivity.getMerchantList() || wxCashBackActivity.getMerchantList().size() <= 0 ) { + return new ResultData(Result.ERROR,"商户不能为空"); + } + } TenantEntity tenantEntity = getTenantInfo(); wxCashBackActivity.updateTenantInfo(tenantEntity); wxCashBackActivityService.saveOrUpdateActivity(wxCashBackActivity);