From 74b4a4522f747196fc4f5b455f913244669f41fa Mon Sep 17 00:00:00 2001 From: yjieliang Date: Wed, 25 Sep 2024 14:24:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=AF=B9=E5=BA=94=E6=8F=92=E4=BB=B6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=98=BE=E7=A4=BA=20#10472?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops/store/atom/service/impl/AtomServiceImpl.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomServiceImpl.kt index dbc4cf5e4fb..dda8de93787 100644 --- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomServiceImpl.kt +++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomServiceImpl.kt @@ -1057,6 +1057,7 @@ abstract class AtomServiceImpl @Autowired constructor() : AtomService { ): Page { return if (classifyCode == DEFAULT) { getDefaultAtoms( + userId = userId, projectCode = projectCode, name = name, page = page, @@ -1153,6 +1154,7 @@ abstract class AtomServiceImpl @Autowired constructor() : AtomService { * 获取默认安装的插件列表 */ private fun getDefaultAtoms( + userId: String, projectCode: String, name: String?, page: Int, @@ -1174,7 +1176,8 @@ abstract class AtomServiceImpl @Autowired constructor() : AtomService { atomCodes = atomCodeList.joinToString(","), projectCode = projectCode ).data - + val installTime = + client.get(ServiceProjectResource::class).getProjectByName(userId, projectCode).data?.createdAt records.forEach { val atomClassifyCode = DEFAULT val classifyLanName = I18nUtil.getCodeLanMessage( @@ -1196,7 +1199,7 @@ abstract class AtomServiceImpl @Autowired constructor() : AtomService { summary = it.summary, publisher = it.publisher, installer = SYSTEM, - installTime = "", + installTime = installTime ?: "", installType = DEFAULT, pipelineCnt = pipelineStat?.get(it.atomCode) ?: 0, hasPermission = false