Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-08 01:27:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fleming-add-sort' into 'master'

Browse Source 
[chusan, api]Add id asc sort on aqua chusan user box list

See merge request domeori/aqua!23
This commit is contained in:
Dom Eori
2023-04-16 18:28:32 +00:00
parent bc43c478d6 8bc901dedc
commit 4e43a98090
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java
View File

@@ -9,6 +9,8 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -33,7 +35,9 @@ public class UserItemService {
} }
public List<UserItem> getByUserId(String userId) { public List<UserItem> getByUserId(String userId) {
return userItemRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); List<UserItem> userItemList = userItemRepository.findAllByUser_Card_ExtId(Long.parseLong(userId));
userItemList.sort(Comparator.comparingInt(UserItem::getItemId));
return userItemList;
} }
public Optional<UserItem> getByUserAndItemIdAndKind(UserData user, int itemId, int itemKind) { public Optional<UserItem> getByUserAndItemIdAndKind(UserData user, int itemId, int itemKind) {
@@ -46,7 +50,9 @@ public class UserItemService {
} }
public List<UserItem> getByUserAndItemKind(String userId, int kind) { public List<UserItem> getByUserAndItemKind(String userId, int kind) {
return userItemRepository.findAllByUser_Card_ExtIdAndItemKind(Long.parseLong(userId), kind); List<UserItem> userItemList = userItemRepository.findAllByUser_Card_ExtIdAndItemKind(Long.parseLong(userId), kind);
userItemList.sort(Comparator.comparingInt(UserItem::getItemId));
return userItemList;
} }
public Page<UserItem> getByUserId(String userId, int page, int size) { public Page<UserItem> getByUserId(String userId, int page, int size) {