|
|
@@ -247,10 +247,10 @@ public class WxMsgServiceImpl implements WxMsgService { |
|
|
//2、通过标签 |
|
|
//2、通过标签 |
|
|
String phones = wxMsg.getPhones(); |
|
|
String phones = wxMsg.getPhones(); |
|
|
List<WxCUserBasicInfoFilterListDto> filter = wxMsg.getFilterList(); |
|
|
List<WxCUserBasicInfoFilterListDto> filter = wxMsg.getFilterList(); |
|
|
if (!phones.isEmpty() && !filter.isEmpty()) {//两种方式只能选其一 |
|
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(phones) && filter != null && filter.size() > 0){ |
|
|
return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); |
|
|
return new ResultData(ErrorCode.MSG_SEND_WAY_CHOOSE_ERROR); |
|
|
} |
|
|
} |
|
|
if (phones.isEmpty() && filter.isEmpty()) {//两种方式必须选其一 |
|
|
|
|
|
|
|
|
if (StringUtils.isBlank(phones) && (filter==null || filter.size() == 0)) {//两种方式必须选其一 |
|
|
if(wxMsg.getWay() == EnumSendWay.APPINFOR.getCode()){ |
|
|
if(wxMsg.getWay() == EnumSendWay.APPINFOR.getCode()){ |
|
|
saveOrUpdate(wxMsg,null); |
|
|
saveOrUpdate(wxMsg,null); |
|
|
return new ResultData(); |
|
|
return new ResultData(); |
|
|
|