From 47fd799208029d33913efbe4a0cd2ed11fa5ba53 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 5 Jan 2019 18:52:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A0=87=E7=AD=BE=E7=9F=AD=E4=BF=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=9D=E5=AD=98=E8=8D=89=E7=A8=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxMsgController.java | 2 +- .../service/impl/WxCUserTagsServiceImpl.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java index 7f3d6b815..046ea31d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java @@ -107,7 +107,7 @@ public class WxMsgController extends BaseController { if (phones.equals("")) {//没有手工输入手机号时解析标签,有,继续流转 phones = parselabel(wxMsg.getTenantId(), wxMsg); if (phones.equals("")) {//解析之后手机号依然不存在时返回 - return new ResultData(ErrorCode.MSG_PHONE_NOT_FOUND); + return new ResultData(ErrorCode.MSG_NO_VALID_PHONE); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 040b32b30..6e4e73556 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -126,11 +126,14 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { String str = JSON.toJSONString(tagId); hs.addAll(wxCUserTagsMapper.findByTags(str, tenantId)); } - List userIds = new ArrayList<>(); - userIds.addAll(hs); - WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); - wxCUserBasicInfo.setIds(userIds); - return wxCUserBasicInfoMapper.findList(wxCUserBasicInfo); + if (!hs.isEmpty()) { + List userIds = new ArrayList<>(); + userIds.addAll(hs); + WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); + wxCUserBasicInfo.setIds(userIds); + return wxCUserBasicInfoMapper.findList(wxCUserBasicInfo); + } + return new ArrayList<>(); }