diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 166c882e5..b7659d9bf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -102,11 +102,12 @@ public class WxShopController extends BaseController { suq.setSearchKey(wxShop.getSearchKey()); List shopIdList = wxShopService.getUserShopIds(suq); if (null != shopIdList && shopIdList.size() <= 0 ) { - wxShop.setId(-1L); + wxShop.setSearchKeyShopNumber(wxShop.getSearchKey()); }else { - wxShop.setOrShopIds(shopIdList); + wxShop.setSearchKeyShopIds(shopIdList); + wxShop.setSearchKeyShopNumber(wxShop.getSearchKey()); } - wxShop.setShopNumber(wxShop.getSearchKey()); + } final PageInfo page = wxShopService.listAsPage(wxShop, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 49f4a8936..50f0bb422 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -229,7 +229,9 @@ public class WxShop extends TenantEntity { @TableField(exist = false) private String searchKey; @TableField(exist = false) - private List orShopIds; + private List searchKeyShopIds; + @TableField(exist = false) + private String searchKeyShopNumber; @TableField(exist = false) private Integer shopUserType; @TableField(exist = false) diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 80d20c2e3..d098ca1f8 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -154,13 +154,17 @@ - - and (id in - - #{oridItem} - - or `shop_number` like concat('%', #{shopNumber},'%')) - + + and (`shop_number` like concat('%', #{searchKeyShopNumber},'%') + + or id in + + #{oridItem} + + + ) + + and id in