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 c3d0c8a96..4e8b6ddd2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -71,13 +71,17 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.updateTenantInfo(getTenantInfo()); Map result = new HashMap<>(); PageInfo pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); + Integer hasFlow = null; if (null != pageInfo && null != pageInfo.getList()) { for (WxPropertyContract wpc : pageInfo.getList()) { - if(propertyContractHasWorkFlow(wpc)) { - wpc.setFlowHas(1); - }else { - wpc.setFlowHas(0); + if (null == hasFlow) { + if(propertyContractHasWorkFlow(wpc)) { + hasFlow = 1; + }else { + hasFlow = 0; + } } + wpc.setFlowHas(hasFlow); } } 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 bfe181def..2e3c74b8e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -88,13 +88,17 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.setSortColumns(SortField.Createtime_DESC); //Map result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); PageInfo page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); + Integer hasFlow = null; if (null != page && null != page.getList()) { for (WxRentContract wrc: page.getList()) { - if(rentContractHasWorkFlow(wrc)) { - wrc.setFlowHas(1); - }else { - wrc.setFlowHas(0); + if (null == hasFlow) { + if(rentContractHasWorkFlow(wrc)) { + hasFlow = 1; + }else { + hasFlow = 0; + } } + wrc.setFlowHas(hasFlow); } } 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 c8eb9e245..5cccba5fb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -40,13 +40,17 @@ public class WxRentPropertyContractController extends WxContractBaseController { } wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); + Integer hasFlow = null; if (null != page && null != page.getList()) { for (WxRentPropertyContractVo wrc: page.getList()) { - if(rentPropertyHasWorkFlow(wrc)) { - wrc.setFlowHas(1); - }else { - wrc.setFlowHas(0); + if (null == hasFlow) { + if(rentPropertyHasWorkFlow(wrc)) { + hasFlow = 1; + }else { + hasFlow = 0; + } } + wrc.setFlowHas(hasFlow); } }