Commit 264131c5 by 墨竹

Merge remote-tracking branch 'origin/developer' into developer

parents 00efd58e e4f50275
...@@ -129,6 +129,10 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -129,6 +129,10 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
Page<TabHaobanWxEnterprise> page = wxEnterpriseMapper.list(keyword, enterpriseIds, gicContactFlag, version, enterpriseIdsNotIn); Page<TabHaobanWxEnterprise> page = wxEnterpriseMapper.list(keyword, enterpriseIds, gicContactFlag, version, enterpriseIdsNotIn);
// 数据转换+白名单过滤 // 数据转换+白名单过滤
if (Objects.isNull(page) || CollectionUtils.isEmpty(page.getResult())) { if (Objects.isNull(page) || CollectionUtils.isEmpty(page.getResult())) {
com.gic.api.base.commons.Page<Object> objectPage = new com.gic.api.base.commons.Page<>();
objectPage.setPageSize(pageInfo.getPageSize());
objectPage.setCurrentPage(pageInfo.getPageNum());
objectPage.setResult(Collections.emptyList());
return new com.gic.api.base.commons.Page<>(); return new com.gic.api.base.commons.Page<>();
} }
com.gic.api.base.commons.Page<YwWxEnterpriseDTO> resPage = PageUtil.changePageHelperToCurrentPage(page, YwWxEnterpriseDTO.class); com.gic.api.base.commons.Page<YwWxEnterpriseDTO> resPage = PageUtil.changePageHelperToCurrentPage(page, YwWxEnterpriseDTO.class);
......
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
) )
</if> </if>
<if test="keyword != null and keyword != '' and (enterpriseIds == null or enterpriseIds.size() == 0)"> <if test="keyword != null and keyword != '' and (enterpriseIds == null or enterpriseIds.size() == 0)">
and (corp_name like CONCAT('%',#{keyword},'%') and corp_name like CONCAT('%',#{keyword},'%')
</if> </if>
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment