|
@@ -183,6 +183,8 @@ public class CmsGroupRelationController {
|
|
|
}
|
|
}
|
|
|
SearchResult<GroupsRelationIndependentView> search = beanSearcher.search(GroupsRelationIndependentView.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
SearchResult<GroupsRelationIndependentView> search = beanSearcher.search(GroupsRelationIndependentView.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
.put("condition", condition)
|
|
.put("condition", condition)
|
|
|
|
|
+ .orderBy(GroupsRelationIndependentView::getIsRenew)
|
|
|
|
|
+ .orderBy(GroupsRelationIndependentView::getSubmitTime).desc()
|
|
|
.build());
|
|
.build());
|
|
|
search.getDataList().forEach(e->{
|
|
search.getDataList().forEach(e->{
|
|
|
GroupsTrips groupsTrips = beanSearcher.searchFirst(GroupsTrips.class, MapUtils.builder().field(GroupsTrips::getId, e.getGroupsId()).build());
|
|
GroupsTrips groupsTrips = beanSearcher.searchFirst(GroupsTrips.class, MapUtils.builder().field(GroupsTrips::getId, e.getGroupsId()).build());
|