|
|
|
@@ -44,8 +44,8 @@ public class WxBillRentManageController extends BaseController { |
|
|
|
wxBillRentManage.updateTenantInfo(getTenantInfo()); |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
wxBillRentManage.setFloorForRule(dataRule.getFloorForRule()); |
|
|
|
wxBillRentManage.setBusinessForRule(dataRule.getBusinessForRule()); |
|
|
|
wxBillRentManage.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxBillRentManage.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); |
|
|
|
final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); |
|
|
|
@@ -138,8 +138,8 @@ public class WxBillRentManageController extends BaseController { |
|
|
|
wxBillRent.updateTenantInfo(getTenantInfo()); |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
wxBillRent.setFloorForRule(dataRule.getFloorForRule()); |
|
|
|
wxBillRent.setBusinessForRule(dataRule.getBusinessForRule()); |
|
|
|
wxBillRent.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
wxBillRentManageService.exportBill(request, response, wxBillRent); |
|
|
|
} |
|
|
|
|