From 44bcadceae47fd5d85146f26f5c6d3e1d3a7d518 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 21 Jan 2019 15:33:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=B5=81&?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=BD=A6=E8=BE=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxFlowServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 58e2dfd19..a003ff9cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -218,13 +218,6 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); result.add(0,wxFlowRecord); } - - for (WxFlowRecord wxFlowRecord:result) { - if(wxFlowRecord.getStatus() == 1){ - wxFlowRecord.setIsLastStart(1); - break; - } - } } @@ -282,6 +275,15 @@ public class WxFlowServiceImpl implements WxFlowService { continue; } } + + if(CollectionUtils.isNotEmpty(resultList)){ + for (WxFlowRecord wxFlowRecord:resultList) { + if(wxFlowRecord.getStatus() == 1){ + wxFlowRecord.setIsLastStart(1); + break; + } + } + } return new ResultData(resultList); }