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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java

@@ -129,6 +129,10 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         Page<TabHaobanWxEnterprise> page = wxEnterpriseMapper.list(keyword, enterpriseIds, gicContactFlag, version, enterpriseIdsNotIn);
         // 数据转换+白名单过滤
         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<>();
         }
         com.gic.api.base.commons.Page<YwWxEnterpriseDTO> resPage = PageUtil.changePageHelperToCurrentPage(page, YwWxEnterpriseDTO.class);

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

@@ -398,7 +398,7 @@
                 )
             </if>
             <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>