diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index dd7a72be7..0f6897a63 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -202,13 +202,22 @@ public class WxMerchantController extends BaseController { List ids = wxMerchantService.getShopMerchantIds(sq); if (null != ids && ids.size() > 0 ) { wxMerchant.setIds(ids); - wxMerchant.setQueryCondition("m.id in ("+StringUtils.join(ids,",")+") or m.name like '%"+wxMerchant.getSearchKey()+"%' "); - }else { - wxMerchant.setName(wxMerchant.getSearchKey()); + } + //或者根据商户名称查询 + WxMerchant mq = new WxMerchant(); + mq.updateTenantInfo(wxMerchant); + mq.setName(wxMerchant.getSearchKey()); + List mids = wxMerchantService.findIdList(mq); + if (null != mids && mids.size() > 0 ) { + if (null != wxMerchant.getIds()) { + wxMerchant.getIds().addAll(mids); + }else { + wxMerchant.setIds(mids); + } } wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); - wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); + //wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index d73f0f472..1a99c3da9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -506,6 +506,4 @@ public class WxMerchant extends TenantEntity { private List privateRentShopTypeList; @TableField(exist = false) private List createShopNumberList; - @TableField(exist = false) - public String queryCondition; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index f093ee36b..df95210f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -178,7 +178,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { Map merchantRentMap = new HashMap(); initQueryParam(record,false, merchantRentMap); PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); - if (null != page && null != page.getList()){ + if (null != page && null != page.getList() && page.getList().size() > 0 ) { List merchantIds = new ArrayList(); for (int i = 0 ; i < page.getList().size(); i++) { WxMerchant m = page.getList().get(i); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index ceeecfc32..0ee4d9a4b 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -187,10 +187,6 @@ and m.`create_shop_type` = #{createShopType} - - and ( #{queryCondition} ) - - and m.`create_shop_type` in