diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java index 97f873c3b..3cbf0d339 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java @@ -91,7 +91,9 @@ public class CouponInjectController extends BaseController { CouponInject couponInject = couponInjectService.getById(id); if (couponInject != null) { List tagids = JSON.parseArray(couponInject.getTags(), Long.class); - couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids)); + if (tagids.size() > 0) { + couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids)); + } } return new ResultData(Result.SUCCESS, "查询成功", couponInject); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 818ff2502..f1272ad2e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -209,23 +209,25 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUserTags uTag = wxCUserTagsMapper.selectByPrimaryKey(entity.getTagId()); if (StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); - WxTags wxTagsQ = new WxTags(); - wxTagsQ.setIds(ids); - List tagList = wxTagsMapper.findList(wxTagsQ); - String tagNames = ""; - String tagIds = ""; - List tagIdList = new ArrayList<>(); - for (WxTags wt : tagList) { - tagNames += wt.getName() + "/"; - tagIds += wt.getId() + ","; - tagIdList.add(wt.getId()); - } - if (StringUtils.isNotBlank(tagNames)) { - entity.setTagNames(tagNames.substring(0, tagNames.length() - 1)); - tagCellTwo.setCellValue(entity.getTagNames()); - } - if (StringUtils.isNoneBlank(tagIds)) { - entity.setTagIds(tagIds.substring(0, tagIds.length() - 1)); + if (ids.size() > 0) { + WxTags wxTagsQ = new WxTags(); + wxTagsQ.setIds(ids); + List tagList = wxTagsMapper.findList(wxTagsQ); + String tagNames = ""; + String tagIds = ""; + List tagIdList = new ArrayList<>(); + for (WxTags wt : tagList) { + tagNames += wt.getName() + "/"; + tagIds += wt.getId() + ","; + tagIdList.add(wt.getId()); + } + if (StringUtils.isNotBlank(tagNames)) { + entity.setTagNames(tagNames.substring(0, tagNames.length() - 1)); + tagCellTwo.setCellValue(entity.getTagNames()); + } + if (StringUtils.isNoneBlank(tagIds)) { + entity.setTagIds(tagIds.substring(0, tagIds.length() - 1)); + } } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 8a45923ac..0a167fe54 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -61,10 +61,14 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCampaignMapper.updateByPrimaryKeySelective(record); } record = wxCampaignMapper.selectByPrimaryKey(record); - if (record.getStatus() == 0) - addOrUpdateBatch(JSONArray.parseArray(record.getCouponIds(),String.class),record); - else + if (record.getStatus() == 0) { + List ids= JSONArray.parseArray(record.getCouponIds(),String.class); + if (ids.size() > 0) { + addOrUpdateBatch(ids, record); + } + } else { delBatch(record); + } } public void delBatch(WxCampaign record) {