|
@@ -801,7 +801,7 @@ public class ProgrammeService {
|
|
|
return new PageImpl<>(new ArrayList<>(), JpaUtils.toPageRequest(pageQuery), 0);
|
|
return new PageImpl<>(new ArrayList<>(), JpaUtils.toPageRequest(pageQuery), 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- pageQuery.setSort("allScore,asc;arrangeId,asc;showBegin,asc;");
|
|
|
|
|
|
|
+ pageQuery.setSort("arrangeId,asc;id,asc;");
|
|
|
Page<Programme> all = programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
|
|
Page<Programme> all = programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
|
|
|
List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
|
|
List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
|
|
|
if (auditTimes > 1) {
|
|
if (auditTimes > 1) {
|