bug:模板查询逻辑在模板列表查询为空时会查询所有源模板等问题修复 TencentBlueKing#2322

carlyin0801 · Aug 10, 2020 · 74b748a · 74b748a
1 parent 825ec15
commit 74b748a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/...s/src/main/kotlin/com/tencent/devops/process/api/template/ServicePTemplateResourceImpl.kt b/...s/src/main/kotlin/com/tencent/devops/process/api/template/ServicePTemplateResourceImpl.kt
@@ -76,7 +76,9 @@ class ServicePTemplateResourceImpl @Autowired constructor(
             projectId = projectId,
             userId = userId,
             templateType = templateType,
-            storeFlag = storeFlag
+            storeFlag = storeFlag,
+            page = 1,
+            pageSize = 1000
         ))
     }
 
@@ -102,7 +104,9 @@ class ServicePTemplateResourceImpl @Autowired constructor(
         return Result(templateService.listAllTemplate(
             projectId = projectId,
             templateType = templateType,
-            templateIds = null
+            templateIds = null,
+            page = 1,
+            pageSize = 1000
         ))
     }
 

diff --git a/...ess/src/main/kotlin/com/tencent/devops/process/engine/service/template/TemplateService.kt b/...ess/src/main/kotlin/com/tencent/devops/process/engine/service/template/TemplateService.kt
@@ -489,32 +489,29 @@ class TemplateService @Autowired constructor(
             templateName = null,
             storeFlag = storeFlag
         )
-        dslContext.transaction { configuration ->
-            val context = DSL.using(configuration)
-            val templates = templateDao.listTemplate(
-                dslContext = context,
-                projectId = projectId,
-                includePublicFlag = null,
-                templateType = templateType,
-                templateIdList = null,
-                storeFlag = storeFlag,
-                page = page,
-                pageSize = pageSize
-            )
-            logger.info("after get templates")
-            fillResult(
-                context = context,
-                templates = templates,
-                hasManagerPermission = hasManagerPermission,
-                userId = userId,
-                templateType = templateType,
-                storeFlag = storeFlag,
-                page = page,
-                pageSize = pageSize,
-                keywords = keywords,
-                result = result
-            )
-        }
+        val templates = templateDao.listTemplate(
+            dslContext = dslContext,
+            projectId = projectId,
+            includePublicFlag = null,
+            templateType = templateType,
+            templateIdList = null,
+            storeFlag = storeFlag,
+            page = page,
+            pageSize = pageSize
+        )
+        logger.info("after get templates")
+        fillResult(
+            context = dslContext,
+            templates = templates,
+            hasManagerPermission = hasManagerPermission,
+            userId = userId,
+            templateType = templateType,
+            storeFlag = storeFlag,
+            page = page,
+            pageSize = pageSize,
+            keywords = keywords,
+            result = result
+        )
         return TemplateListModel(projectId, hasManagerPermission, result, count)
     }