From 7d3fd73b198db3decd4318df554d12355e209390 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 19:47:56 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/basic/WxMerchantController.java | 4 ++-- .../controller/contract/WxPropertyContractController.java | 2 +- .../controller/contract/WxRentContractController.java | 2 +- .../controller/contract/WxRentPropertyContractController.java | 2 +- .../src/main/java/com/iformall/domain/po/WxUserDataRule.java | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index d992c5357..57c664e65 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -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 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); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 8b364e5ea..de3c6cfb8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -70,7 +70,7 @@ public class WxPropertyContractController extends WxContractBaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); - //wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); + wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); } PageInfo pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 91582110c..9e7fb5545 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -79,7 +79,7 @@ public class WxRentContractController extends WxContractBaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxRentContract.setFloorForRule(dataRule.getFloorIds()); - //wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); + wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); } PageInfo page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index d0a5e9edb..b322893b9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -55,7 +55,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); - //wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); + wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); } PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java index d182d2d47..d61899834 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java @@ -42,10 +42,11 @@ public class WxUserDataRule extends TenantEntity { } public String getBussinessIds() { + /** if (StringUtils.isNotEmpty(business)) { Object[] data = JSONArray.parseArray(business).toArray(); return StringUtils.join(data, ","); - } + }*/ return null; }