|
|
|
@@ -202,13 +202,22 @@ public class WxMerchantController extends BaseController { |
|
|
|
List<Long> 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<Long> 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()); |
|
|
|
|