From 868fe796a5346ce0bf56956bba4c3681de111b5f Mon Sep 17 00:00:00 2001
From: greysonfang <greysonfang@tencent.com>
Date: Wed, 27 Dec 2023 17:00:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E3=80=90=E8=93=9D=E7=9B=BE=E3=80=91?=
 =?UTF-8?q?=E3=80=90=E4=BA=A7=E5=93=81=E8=AF=84=E5=AE=A1=E4=BC=9A-?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=84=E5=AE=A1=E3=80=91=E6=94=AF=E6=8C=81=E4=B8=BA?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AA=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9D=83=E9=99=90=20#9574?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/engine/dao/template/TemplateDao.kt  |  6 ++++++
 .../service/template/TemplateFacadeService.kt   | 17 +++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplateDao.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplateDao.kt
index 820e689a33a..4182a7b7890 100644
--- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplateDao.kt
+++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplateDao.kt
@@ -31,6 +31,7 @@ import com.tencent.devops.common.api.exception.ErrorCodeException
 import com.tencent.devops.model.process.tables.TTemplate
 import com.tencent.devops.model.process.tables.records.TTemplateRecord
 import com.tencent.devops.process.constant.ProcessMessageCode
+import com.tencent.devops.process.constant.ProcessMessageCode.FAIL_TO_LIST_TEMPLATE_PARAMS
 import com.tencent.devops.process.pojo.template.TemplateType
 import com.tencent.devops.store.pojo.common.KEY_CREATE_TIME
 import com.tencent.devops.store.pojo.common.KEY_ID
@@ -447,6 +448,11 @@ class TemplateDao {
         limit: Int?,
         queryModelFlag: Boolean = true
     ): Result<out Record>? {
+        if (projectId == null && templateIdList == null && limit == null)
+            throw ErrorCodeException(
+                defaultMessage = "list pipeline templates params error",
+                errorCode = FAIL_TO_LIST_TEMPLATE_PARAMS
+            )
         val tTemplate = TTemplate.T_TEMPLATE
 
         val conditions = mutableListOf<Condition>()
diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt
index 7a76af4bc3a..b5e64ab81a8 100644
--- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt
+++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt
@@ -747,7 +747,8 @@ class TemplateFacadeService @Autowired constructor(
             storeFlag = storeFlag,
             hasManagerPermission = hasManagerPermission,
             page = page,
-            pageSize = pageSize
+            pageSize = pageSize,
+            templateIds = null
         )
         logger.info("get templates and count :$templateWithPermission")
         fillResult(
@@ -790,7 +791,8 @@ class TemplateFacadeService @Autowired constructor(
         checkPermission: Boolean = true,
         page: Int?,
         pageSize: Int?,
-        includePublicFlag: Boolean? = null
+        includePublicFlag: Boolean? = null,
+        templateIds: Collection<String>?
     ): TemplateWithPermission {
         val offset = if (null != page && null != pageSize) (page - 1) * pageSize else null
         // 若不开启模板权限或者不检查列表权限的，直接返回列表数据。
@@ -803,7 +805,8 @@ class TemplateFacadeService @Autowired constructor(
                 storeFlag = storeFlag,
                 offset = offset,
                 pageSize = pageSize,
-                hasManagerPermission = hasManagerPermission
+                hasManagerPermission = hasManagerPermission,
+                templateIds = templateIds
             )
         } else {
             logger.info("get templates with permission :$projectId|$userId|$checkPermission")
@@ -836,7 +839,8 @@ class TemplateFacadeService @Autowired constructor(
         storeFlag: Boolean?,
         offset: Int?,
         pageSize: Int?,
-        hasManagerPermission: Boolean?
+        hasManagerPermission: Boolean?,
+        templateIds: Collection<String>?
     ): TemplateWithPermission {
         val tTemplate = TTemplate.T_TEMPLATE
         val templateRecord = templateDao.listTemplate(
@@ -844,7 +848,7 @@ class TemplateFacadeService @Autowired constructor(
             projectId = projectId,
             includePublicFlag = includePublicFlag,
             templateType = templateType,
-            templateIdList = null,
+            templateIdList = templateIds,
             storeFlag = storeFlag,
             offset = offset,
             limit = pageSize,
@@ -1163,7 +1167,8 @@ class TemplateFacadeService @Autowired constructor(
             checkPermission = checkPermission,
             page = page,
             pageSize = pageSize,
-            includePublicFlag = true
+            includePublicFlag = true,
+            templateIds = templateIds
         )
         val templates = templateWithPermission.templatesWithListPermRecords
         val templateCount = templateWithPermission.count