|
|
@@ -28,6 +28,7 @@ import javax.annotation.security.PermitAll;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.validation.Valid;
|
|
|
import java.io.IOException;
|
|
|
+import java.util.Comparator;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -114,8 +115,9 @@ public class FlowGroupController {
|
|
|
groups.forEach(item -> {
|
|
|
List<FlowDO> groupId = flowMapper.selectList("group_id", item.getId()).stream().filter(e -> e.getStatus()==0).collect(Collectors.toList());
|
|
|
List<FlowRespVO> bean = BeanUtils.toBean(groupId, FlowRespVO.class);
|
|
|
- item.setFlowRespVOS(bean);
|
|
|
+ item.setFlowRespVOS(bean.stream().sorted(Comparator.comparing(FlowRespVO::getSort)).collect(Collectors.toList()));
|
|
|
});
|
|
|
- return success(groups);
|
|
|
+ List<FlowGroupRespVO> collect = groups.stream().sorted(Comparator.comparing(FlowGroupRespVO::getSort)).collect(Collectors.toList());
|
|
|
+ return success(collect);
|
|
|
}
|
|
|
}
|