Merge remote-tracking branch 'origin/develop' into develop

@@ -572,8 +572,9 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         if(CollectionUtils.isNotEmpty(pageList.getRecords())){
         if(CollectionUtils.isNotEmpty(pageList.getRecords())){
             List<String> guids = pageList.getRecords().stream().map(MfDemand::getGuid).collect(Collectors.toList());
             List<String> guids = pageList.getRecords().stream().map(MfDemand::getGuid).collect(Collectors.toList());
             List<DemandRSVO> results = new ArrayList<>();
             List<DemandRSVO> results = new ArrayList<>();
+            Map<String, DemandUpdateStateVO> stateMap = getStateMap(guids);
             for (MfDemand item : pageList.getRecords()){
             for (MfDemand item : pageList.getRecords()){
-                DemandRSVO vo = convertToVO(item,getStateMap(guids));
+                DemandRSVO vo = convertToVO(item, stateMap);
                 results.add(vo);
                 results.add(vo);
             }
             }
             rsPageList.setRecords(results);
             rsPageList.setRecords(results);