|
|
@@ -111,13 +111,13 @@ class KnowledgeManageAPIView(APIView):
|
|
|
page_num = int(request_data.get("pagenum", 1)) if request_data.get("pagenum") else 1
|
|
|
page_size = int(request_data.get("pagesize", 10)) if request_data.get("pagesize") else 10
|
|
|
if category_id and related_plan:
|
|
|
- queryset = KnowledgeManage.objects.filter( Q(is_delete=1) & Q(related_plan__icontains=related_plan) & Q(category=category_id)).order_by("-addtime")
|
|
|
+ queryset = KnowledgeManage.objects.filter( Q(is_delete=1) & Q(related_plan__icontains=related_plan) & Q(category=category_id)).order_by("-is_top","-addtime")
|
|
|
elif category_id and not related_plan:
|
|
|
- queryset = KnowledgeManage.objects.filter(Q(is_delete=1) & Q(category=category_id) ).order_by("-addtime")
|
|
|
+ queryset = KnowledgeManage.objects.filter(Q(is_delete=1) & Q(category=category_id) ).order_by("-is_top","-addtime")
|
|
|
elif related_plan and not category_id:
|
|
|
- queryset = KnowledgeManage.objects.filter( Q(is_delete=1) & Q(related_plan__icontains=related_plan)).order_by("-addtime")
|
|
|
+ queryset = KnowledgeManage.objects.filter( Q(is_delete=1) & Q(related_plan__icontains=related_plan)).order_by("-is_top","-addtime")
|
|
|
else:
|
|
|
- queryset = KnowledgeManage.objects.filter(is_delete=1).order_by("-addtime")
|
|
|
+ queryset = KnowledgeManage.objects.filter(is_delete=1).order_by("-is_top","-addtime")
|
|
|
total_obj = queryset.count()
|
|
|
paginator = Paginator(queryset, page_size)
|
|
|
page_obj = paginator.get_page(page_num)
|