From b03232e56752012a8625996ae5b68e5d7fede5b6 Mon Sep 17 00:00:00 2001
From: wangqing <408564126@qq.com>
Date: Wed, 30 Oct 2024 16:47:24 +0800
Subject: [PATCH] =?UTF-8?q?release--=E5=8E=BB=E9=99=A4=E6=9C=9F=E5=88=8A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8C=BF=E5=90=8D=E6=B5=8F=E8=A7=88=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../music/controller/JournalController.java   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/luoo_music/src/main/java/com/luoo/music/controller/JournalController.java b/luoo_music/src/main/java/com/luoo/music/controller/JournalController.java
index 99d800a..d1dc833 100644
--- a/luoo_music/src/main/java/com/luoo/music/controller/JournalController.java
+++ b/luoo_music/src/main/java/com/luoo/music/controller/JournalController.java
@@ -70,7 +70,7 @@ public class JournalController {
 			@RequestHeader(value = "device_type", required = false) String deviceType,
 			@VerifyParam JournalQueryReq queryReq) {
 		UserLoginDto user = jwtUtil.getUserLoginDto(authorization);
-		updateQuery(deviceType,user,queryReq);
+//		updateQuery(deviceType,user,queryReq);
 		Long count = journalService.countJournal(queryReq);
 		if(0==count) {
 			return Result.success(new PageResult<JournalRespDTO>(count, Collections.emptyList()));
@@ -90,16 +90,16 @@ public class JournalController {
 	private Set<String> getJournalCollectSet(UserLoginDto user) {
 		return null == user ? Collections.emptySet():getJournalCollectSet(user.getUserId());
 	}
-	private void updateQuery(String deviceType, UserLoginDto user, JournalQueryReq queryReq) {
-		if(DeviceTypeUtil.isWeb(deviceType)) {
-			return;
-		}
-		if (StringTools.isEmpty(queryReq.getCategoryId()) && null == user) {
-			queryReq.setCategoryId(null);
-			queryReq.setPageNum(1);
-			queryReq.setPageSize(10);
-		}
-	}
+//	private void updateQuery(String deviceType, UserLoginDto user, JournalQueryReq queryReq) {
+//		if(DeviceTypeUtil.isWeb(deviceType)) {
+//			return;
+//		}
+//		if (StringTools.isEmpty(queryReq.getCategoryId()) && null == user) {
+//			queryReq.setCategoryId(null);
+//			queryReq.setPageNum(1);
+//			queryReq.setPageSize(10);
+//		}
+//	}
 	private Set<String> getJournalCollectSet(String userId) {
 		Set<String> set=(Set<String>) redisTemplate.opsForValue().get(Constants.REDIS_KEY_USER_COLLECT_JOURNAL+userId);
 		if(null==set) {