| @@ -78,7 +78,7 @@ public class WxMerchantController extends BaseController { | |||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | WxUserDataRule dataRule = this.getCurrentDataFloors(); | ||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| } | } | ||||
| final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); | final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -376,7 +376,7 @@ public class WxMerchantController extends BaseController { | |||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | WxUserDataRule dataRule = this.getCurrentDataFloors(); | ||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxMerchant.setFloorForRule(dataRule.getFloorIds()); | wxMerchant.setFloorForRule(dataRule.getFloorIds()); | ||||
| //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| } | } | ||||
| wxMerchantService.exportData(wxMerchant,request,response); | wxMerchantService.exportData(wxMerchant,request,response); | ||||
| } | } | ||||
| @@ -70,7 +70,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | WxUserDataRule dataRule = this.getCurrentDataFloors(); | ||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); | wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); | ||||
| //wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| } | } | ||||
| PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -79,7 +79,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | WxUserDataRule dataRule = this.getCurrentDataFloors(); | ||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxRentContract.setFloorForRule(dataRule.getFloorIds()); | wxRentContract.setFloorForRule(dataRule.getFloorIds()); | ||||
| //wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| } | } | ||||
| PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -55,7 +55,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { | |||||
| WxUserDataRule dataRule = this.getCurrentDataFloors(); | WxUserDataRule dataRule = this.getCurrentDataFloors(); | ||||
| if (null != dataRule) { | if (null != dataRule) { | ||||
| wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); | wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); | ||||
| //wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); | |||||
| } | } | ||||
| PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| @@ -42,10 +42,11 @@ public class WxUserDataRule extends TenantEntity { | |||||
| } | } | ||||
| public String getBussinessIds() { | public String getBussinessIds() { | ||||
| /** | |||||
| if (StringUtils.isNotEmpty(business)) { | if (StringUtils.isNotEmpty(business)) { | ||||
| Object[] data = JSONArray.parseArray(business).toArray(); | Object[] data = JSONArray.parseArray(business).toArray(); | ||||
| return StringUtils.join(data, ","); | return StringUtils.join(data, ","); | ||||
| } | |||||
| }*/ | |||||
| return null; | return null; | ||||
| } | } | ||||