From 8d06692124eb8f7a69be6cc14f6a37205a741785 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 28 Feb 2022 10:53:51 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=82=20countByFilter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/mapper/WxCUserTagsMapper.java | 4 ++-- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 4 +++- .../com/iformall/service/impl/WxCUserTagsServiceImpl.java | 1 + .../src/main/resources/mapper/WxCUserTagsMapper.xml | 7 ++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java index 4549ae26f..8deb54655 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java @@ -12,9 +12,9 @@ public interface WxCUserTagsMapper extends CommonMapper { WxCUserTags selectById(@Param("id")Long id,@Param("tenantId")String tenantId); List findList(WxCUserTags wxCUserTags); - List findIdList(@Param("tenantId")String tenantId, @Param("tagIdList")List tagIdList); + List findIdList(@Param("tenantId")String tenantId, @Param("tagCodes")String tagCodes); - List findUserIdList(@Param("tagIds")String tagIds,@Param("tenantId")String tenantId); + List findUserIdList(@Param("tagCodes")String tagCodes,@Param("tenantId")String tenantId); void updateNewId(CUserTagNewIdVo record); 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 3019c2287..95c83087f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -439,7 +440,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } }); if(!tagIdList.isEmpty()){ - List tagIds = wxCUserTagsMapper.findIdList(tenantEntity.getTenantId(),tagIdList); + String tagCodes = JSON.toJSONString(tagIdList); + List tagIds = wxCUserTagsMapper.findIdList(tenantEntity.getTenantId(),tagCodes); if(!tagIds.isEmpty()){ dto.setTagIds(tagIds); } 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 720e5ce0f..d39769d85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -85,6 +85,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { }else{ WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.updateTenantInfo(tenantEntity); + dto.setIds(userIds); dto.setStartTime(startTime); dto.setEndTime(endTime); return wxCUserBasicInfoMapper.findCount(dto); diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index b3d911a6f..72aec4b4c 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -74,10 +74,7 @@ select id from wx_c_user_tags where tenant_id = #{tenantId} - and - - JSON_CONTAINS(tags,#{tagId}) - + and JSON_CONTAINS(tags,#{tagCodes}) @@ -92,7 +89,7 @@ from wx_c_user_tags where tenant_id = #{tenantId} - and JSON_CONTAINS(tags,#{tagIds}) + and JSON_CONTAINS(tags,#{tagCodes})