From 87c490fcb512356118bc5003dde008db2477e5bb Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Nov 2020 15:28:44 +0800 Subject: [PATCH] xingxingdiandeng --- .../main/java/com/iformall/service/impl/WxMsgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index a796d5dbd..725e128b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -247,10 +247,10 @@ public class WxMsgServiceImpl implements WxMsgService { //2、通过标签 String phones = wxMsg.getPhones(); List 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); } - if (phones.isEmpty() && filter.isEmpty()) {//两种方式必须选其一 + if (StringUtils.isBlank(phones) && (filter==null || filter.size() == 0)) {//两种方式必须选其一 if(wxMsg.getWay() == EnumSendWay.APPINFOR.getCode()){ saveOrUpdate(wxMsg,null); return new ResultData();