|
|
|
@@ -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); |
|
|
|
@@ -105,7 +105,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); |
|
|
|
@@ -366,7 +366,6 @@ public class WxMerchantController extends BaseController { |
|
|
|
return new ResultData(wxMerchant); |
|
|
|
} |
|
|
|
|
|
|
|
@UserDataRuleAnnotation("merchant_list") |
|
|
|
@ApiOperation("商户数据导出") |
|
|
|
@GetMapping("/exportData") |
|
|
|
@SystemControllerLog(description = "商户-商户数据导出") |
|
|
|
@@ -374,6 +373,11 @@ public class WxMerchantController extends BaseController { |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
//wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
wxMerchantService.exportData(wxMerchant,request,response); |
|
|
|
} |
|
|
|
|
|
|
|
|