diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index fe4800919..759c3389d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -96,24 +96,28 @@ public class WxAgileContractController extends WxContractBaseController { wxRentContract.setMainContract(EnumYesOrNo.YES.getCode()); PageInfo page = wxAgileContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; + Integer yingziHasFlow = null; if (null != page && null != page.getList()) { for (WxRentContract wrc: page.getList()) { if (null == hasFlow) { if(rentContractHasWorkFlow(wrc)) { - wrc.setFlowHas(1); + hasFlow = 1 ; }else { - wrc.setFlowHas(0); + hasFlow = 0; } } wrc.setFlowHas(hasFlow); //查询影子合同 WxRentContract yingzi = wxAgileContractService.findYingZiContract(wrc.getId(), wrc); if (null != yingzi) { - if(rentContractHasWorkFlow(yingzi)) { - yingzi.setFlowHas(1) ; - }else { - yingzi.setFlowHas(0) ; - } + if (null == yingziHasFlow) { + if(rentContractHasWorkFlow(yingzi)) { + yingziHasFlow = 1 ; + }else { + yingziHasFlow = 0 ; + } + } + yingzi.setFlowHas(yingziHasFlow); } wrc.setChild(yingzi); }