|
|
|
@@ -78,7 +78,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
//wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -376,7 +376,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
//wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
wxMerchantService.exportData(wxMerchant,request,response); |
|
|
|
} |
|
|
|
|