| | |
|---|
| | | if (accountSubjectDto != null && accountSubjectDto.getStatus() != null) { |
|---|
| | | queryWrapper.eq(AccountSubject::getStatus, accountSubjectDto.getStatus()); |
|---|
| | | } |
|---|
| | | queryWrapper.orderByAsc(AccountSubject::getSubjectCode).orderByAsc(AccountSubject::getId); |
|---|
| | | queryWrapper.orderByDesc(AccountSubject::getSubjectCode).orderByDesc(AccountSubject::getId); |
|---|
| | | return queryWrapper; |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | } |
|---|
| | | List<AccountSubject> sortedSubjects = new ArrayList<>(subjects); |
|---|
| | | sortedSubjects.sort(Comparator |
|---|
| | | .comparing(AccountSubject::getSubjectCode, Comparator.nullsLast(String::compareTo)) |
|---|
| | | .thenComparing(AccountSubject::getId, Comparator.nullsLast(Long::compareTo))); |
|---|
| | | .comparing(AccountSubject::getSubjectCode, Comparator.nullsFirst(String::compareTo)).reversed() |
|---|
| | | .thenComparing(AccountSubject::getId, Comparator.nullsFirst(Long::compareTo)).reversed()); |
|---|
| | | |
|---|
| | | Map<Long, AccountSubjectVo> subjectVoMap = new LinkedHashMap<>(); |
|---|
| | | for (AccountSubject subject : sortedSubjects) { |
|---|
