|
|
@@ -117,7 +117,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
|
|
|
conceptQe.orderByDesc("status");
|
|
|
conceptQe.orderByDesc("gmt_modified");
|
|
|
conceptQe.orderByDesc("id");
|
|
|
- IPage<KlConcept> conceptPage = this.page(klConceptInfoVO);
|
|
|
+ IPage<KlConcept> conceptPage = this.page(klConceptInfoVO, conceptQe);
|
|
|
BeanUtil.copyProperties(conceptPage, klConceptInfoDTOPage);
|
|
|
|
|
|
if (ListUtil.isNotEmpty(conceptPage.getRecords())) {
|
|
|
@@ -132,8 +132,8 @@ public class KlConceptFacade extends KlConceptServiceImpl {
|
|
|
QueryWrapper<KlLibraryInfo> qw = new QueryWrapper<>();
|
|
|
qw.in("concept_id", conceptIds)
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
- .orderByAsc("concept_id")
|
|
|
- .orderByAsc("is_concept");
|
|
|
+ .orderByDesc("concept_id")
|
|
|
+ .orderByDesc("is_concept");
|
|
|
Map<Long, List<KlLibraryInfo>> libMap = klLibraryInfoFacade.list(qw)
|
|
|
.stream().collect(Collectors.groupingBy(KlLibraryInfo::getConceptId));
|
|
|
//获取类型
|
gaodm