Browse Source

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
b93706c3a0
3 changed files with 12 additions and 2 deletions
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  3. +9
    -0
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java View File

@@ -58,6 +58,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S
List<Long> findVoIdsList(WxCUserBasicInfo wxCUserBasicInfo);
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 countVoList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java View File

@@ -1261,11 +1261,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
}else{
basicInfo.undateFinalTenantId(tenantInfo);
}
list = wxCUserBasicInfoMapper.findVoList(basicInfo);
list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo);
if (null == list || list.size() <= 0 ) {
return null;
}
List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList(basicInfo);
List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList1(tenantInfo,basicInfo);
if (null != userIds && userIds.size() > 0 ) {
WxCUserTags tq = new WxCUserTags();
tq.setUserIdList(userIds);


+ 9
- 0
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml View File

@@ -809,6 +809,15 @@
</if>
</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
count(distinct cu.id)


Loading…
Cancel
Save