Merge branch 'main' of https://go.indie.cn/git/queyue-backend/luoo_parent

luoo_music/src/main/java/com/luoo/music/service/CMSJournalService.java

@@ -78,7 +78,9 @@ public class CMSJournalService {
             Specification<Journal> journalSpecification = buildSearchSpecification(param, journalIdsByTags);
             journalPage = journalDao.findAll(journalSpecification, pageRequest);
         } else {
-            journalPage = journalDao.findAll(pageRequest);
+            List<String> journalIdsByTags = null;
+            Specification<Journal> journalSpecification = buildSearchSpecification(param, journalIdsByTags);
+            journalPage = journalDao.findAll(journalSpecification,pageRequest);
         }
         long totalElements = journalPage.getTotalElements();
         List<Journal> content = journalPage.getContent();
@@ -145,6 +147,7 @@ public class CMSJournalService {
                 Predicate title = builder.like(root.get("title"), likeExpression);
                 predicateList.add(builder.or(journalNo, title));
             }
+            query.orderBy(builder.desc(root.get("journalNo").as(Integer.class)));
             return builder.and(predicateList.toArray(new Predicate[predicateList.size()]));
         };
     }

luoo_tag/src/main/java/com/luoo/tag/service/TagService.java

@@ -217,8 +217,8 @@ public class TagService {
 		if(resultCode == 0){
 			return userInfoResult.getData();
 		}*/
-		UserInfo foo = UserInfo.builder().id("1627863701048659968").name("foo").build();
-		UserInfo other = UserInfo.builder().id("1627863701048659969").name("老左").build();
+		UserInfo foo = UserInfo.builder().id("1627863701048659968").name("落在低处").build();
+		UserInfo other = UserInfo.builder().id("1627863701048659969").name("左岸以西").build();
 		return Lists.newArrayList(foo, other);
 	}