Merge pull request TencentBlueKing#862 from cnlkl/issue_861

bug: 修复分页获取扫描方案总数量字段错误 TencentBlueKing#861
lannoy0523 · Jul 5, 2023 · 36a9f88 · 36a9f88
2 parents 9269b08 + 085701b
commit 36a9f88
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...backend/analyst/biz-analyst/src/main/kotlin/com/tencent/bkrepo/analyst/dao/ScanPlanDao.kt b/...backend/analyst/biz-analyst/src/main/kotlin/com/tencent/bkrepo/analyst/dao/ScanPlanDao.kt
@@ -128,9 +128,9 @@ class ScanPlanDao : ScannerSimpleMongoDao<TScanPlan>() {
         type?.let { criteria.and(TScanPlan::type.name).isEqualTo(type) }
         planNameContains?.let { criteria.and(TScanPlan::name.name).regex(".*$planNameContains.*") }
         val pageRequest = Pages.ofRequest(pageLimit.getNormalizedPageNumber(), pageLimit.getNormalizedPageSize())
-        val query = Query(criteria).with(pageRequest).with(Sort.by(TScanPlan::createdDate.name).descending())
+        val query = Query(criteria).with(Sort.by(TScanPlan::createdDate.name).descending())
 
-        return Pages.ofResponse(pageRequest, count(query), find(query))
+        return Pages.ofResponse(pageRequest, count(query), find(query.with(pageRequest)))
     }
 
     fun page(pageLimit: PageLimit? = null): List<TScanPlan> {