licailing 4 лет назад
Родитель
Сommit
5cbcdb1df8

+ 1 - 1
src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -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) {

+ 0 - 1
src/main/vue/src/views/performance/ProgrammeScoreList.vue

@@ -424,7 +424,6 @@ export default {
         },
         },
         beforeGetData() {
         beforeGetData() {
             let data = {
             let data = {
-                sort: 'id,asc',
                 query: {
                 query: {
                     auditTimes: 1
                     auditTimes: 1
                 }
                 }