feat：环境管理-节点支持按照关键字搜索 TencentBlueKing#10208

jianingzhao616 · Apr 12, 2024 · d46bd56 · d46bd56
1 parent 14d34ff
commit d46bd56
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/...ent/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/NodeService.kt b/...ent/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/NodeService.kt
@@ -185,8 +185,15 @@ class NodeService @Autowired constructor(
             if (-1 != page) {
                 val sqlLimit = PageUtil.convertPageSizeToSQLLimit(page ?: 1, pageSize ?: 20)
                 nodeDao.listNodesWithPageLimitAndSearchCondition(
-                    dslContext, projectId, sqlLimit.limit, sqlLimit.offset,
-                    nodeIp, displayName, createdUser, lastModifiedUser, keywords
+                    dslContext = dslContext,
+                    projectId = projectId,
+                    limit = sqlLimit.limit,
+                    offset = sqlLimit.offset,
+                    nodeIp = nodeIp,
+                    displayName = displayName,
+                    createdUser = createdUser,
+                    lastModifiedUser = lastModifiedUser,
+                    keywords = keywords
                 )
             } else {
                 nodeDao.listNodes(dslContext, projectId)
@@ -195,7 +202,13 @@ class NodeService @Autowired constructor(
             return Page(1, 0, 0, emptyList())
         }
         val count = nodeDao.countForAuthWithSearchCondition(
-            dslContext, projectId, nodeIp, displayName, createdUser, lastModifiedUser, keywords
+            dslContext = dslContext,
+            projectId = projectId,
+            nodeIp = nodeIp,
+            displayName = displayName,
+            createdUser = createdUser,
+            lastModifiedUser = lastModifiedUser,
+            keywords = keywords
         ).toLong()
         return Page(
             page = page ?: 1,