|
|
@@ -1441,14 +1441,14 @@ public class GroupRelationController {
|
|
|
if (relation == null || !userIdList.contains(relation.getUserId())) {
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult();
|
|
|
}
|
|
|
- Date filterTime = relation.getStartTime();
|
|
|
- if (filterTime == null) {
|
|
|
- filterTime = relation.getSubmitTime();
|
|
|
+ Date filterDate = relation.getSubmitTime();
|
|
|
+ if (filterDate == null) {
|
|
|
+ filterDate = relation.getStartTime();
|
|
|
}
|
|
|
List<GptUserRechargeNumRecordView> search = beanSearcher.searchAll(GptUserRechargeNumRecordView.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
.field(GptUserRechargeNumRecordView::getUserId, userIdList).op(Operator.InList)
|
|
|
.field(GptUserRechargeNumRecordView::getRelationId, relationId)
|
|
|
- .field(GptUserRechargeNumRecordView::getCreatedTime, filterTime).op(Operator.GreaterEqual)
|
|
|
+ .field(GptUserRechargeNumRecordView::getCreatedTime, filterDate).op(Operator.GreaterEqual)
|
|
|
.orderBy(GptUserRechargeNumRecordView::getCreatedTime).desc()
|
|
|
.build());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|