From 48c15aa3b378905505581dbacff609ef707c8c71 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 23 Sep 2020 10:18:56 +0800 Subject: [PATCH] fix --- .../controller/mem/WxCUserBasicInfoController.java | 1 - .../main/java/com/iformall/domain/po/WxCUserTags.java | 6 +++++- .../service/impl/WxCUserBasicInfoServiceImpl.java | 9 ++++++--- .../src/main/resources/mapper/WxCUserTagsMapper.xml | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 8af83d537..25f3ab77a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -338,7 +338,6 @@ public class WxCUserBasicInfoController extends BaseController { basicInfo.undateFinalTenantId(ifParentUpdateTenantInfo()); wxCUserBasicInfoService.exportData(ifParentUpdateTenantInfo(),basicInfo, request, response); - } @RequestMapping("/exportTemplate") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java index 0740e4022..228a640c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java @@ -17,12 +17,16 @@ public class WxCUserTags extends BaseTenantEntity { @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") private Long userId; + @TableField(exist = false) - private List userIds; + private List userIdList; + @io.swagger.annotations.ApiModelProperty(value="",name="tags") private String tags; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; 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 80e6231ae..88bfa6d16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1232,10 +1232,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc basicInfo.undateFinalTenantId(tenantInfo); } list = wxCUserBasicInfoMapper.findVoList(basicInfo); + if (null == list || list.size() <= 0 ) { + return null; + } List userIds = wxCUserBasicInfoMapper.findVoIdsList(basicInfo); - if (null != userIds ) { + if (null != userIds && userIds.size() > 0 ) { WxCUserTags tq = new WxCUserTags(); - tq.setUserIds(userIds); + tq.setUserIdList(userIds); List userTagList = wxCUserTagsMapper.findList(tq); if (null != userTagList) { List tagList = wxTagsMapper.findListAll(); @@ -1253,7 +1256,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } } - if (null != list ) { + if (null != list && list.size() > 0 ) { List retList = new ArrayList(); retList.addAll(list); return retList; diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index 6f8ec4293..4a77a27ac 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -47,10 +47,10 @@ - - and user_id in - - #{userIdItem} + + and `user_id` in + + #{uItem}