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 d3b4d9e5f..fe4800919 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -100,14 +100,22 @@ public class WxAgileContractController extends WxContractBaseController { for (WxRentContract wrc: page.getList()) { if (null == hasFlow) { if(rentContractHasWorkFlow(wrc)) { - hasFlow = 1; + wrc.setFlowHas(1); }else { - hasFlow = 0; + wrc.setFlowHas(0); } } wrc.setFlowHas(hasFlow); //查询影子合同 - wrc.setChild(wxAgileContractService.findYingZiContract(wrc.getId(), wrc)); + WxRentContract yingzi = wxAgileContractService.findYingZiContract(wrc.getId(), wrc); + if (null != yingzi) { + if(rentContractHasWorkFlow(yingzi)) { + yingzi.setFlowHas(1) ; + }else { + yingzi.setFlowHas(0) ; + } + } + wrc.setChild(yingzi); } } return new ResultData(page);