| @@ -58,6 +58,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S | |||||
| List<Long> findVoIdsList(WxCUserBasicInfo wxCUserBasicInfo); | List<Long> findVoIdsList(WxCUserBasicInfo wxCUserBasicInfo); | ||||
| List<WxCUserBasicInfoVo> findVoList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo); | List<WxCUserBasicInfoVo> findVoList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo); | ||||
| List<Long> findVoIdsList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo); | |||||
| Integer countVoList(WxCUserBasicInfo wxCUserBasicInfo); | Integer countVoList(WxCUserBasicInfo wxCUserBasicInfo); | ||||
| Integer countVoList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo); | Integer countVoList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo); | ||||
| @@ -1261,11 +1261,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| }else{ | }else{ | ||||
| basicInfo.undateFinalTenantId(tenantInfo); | basicInfo.undateFinalTenantId(tenantInfo); | ||||
| } | } | ||||
| list = wxCUserBasicInfoMapper.findVoList(basicInfo); | |||||
| list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); | |||||
| if (null == list || list.size() <= 0 ) { | if (null == list || list.size() <= 0 ) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList(basicInfo); | |||||
| List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList1(tenantInfo,basicInfo); | |||||
| if (null != userIds && userIds.size() > 0 ) { | if (null != userIds && userIds.size() > 0 ) { | ||||
| WxCUserTags tq = new WxCUserTags(); | WxCUserTags tq = new WxCUserTags(); | ||||
| tq.setUserIdList(userIds); | tq.setUserIdList(userIds); | ||||
| @@ -809,6 +809,15 @@ | |||||
| </if> | </if> | ||||
| </select> | </select> | ||||
| <select id="findVoIdsList1" resultType="java.lang.Long"> | |||||
| select id | |||||
| from wx_c_user_basic_info cu | |||||
| <include refid="dynamicVoWhereConditions1"/> | |||||
| <if test=" null != basicInfo.begin "> | |||||
| limit #{basicInfo.begin}, #{basicInfo.limit} | |||||
| </if> | |||||
| </select> | |||||
| <select id="countVoList" parameterType="com.iformall.domain.po.WxCUserBasicInfo" resultType="java.lang.Integer"> | <select id="countVoList" parameterType="com.iformall.domain.po.WxCUserBasicInfo" resultType="java.lang.Integer"> | ||||
| select | select | ||||
| count(distinct cu.id) | count(distinct cu.id) | ||||