流水线名称的排序没有按a~Z，导致了中英混杂的情况 TencentBlueKing#8508

yongyiduan · Mar 22, 2023 · 0177401 · 0177401
1 parent 9320d68
commit 0177401
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildSummaryDao.kt b/...biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildSummaryDao.kt
@@ -401,9 +401,9 @@ class PipelineBuildSummaryDao {
                 PipelineSortType.NAME -> {
                     T_PIPELINE_INFO.PIPELINE_NAME.let {
                         if (collation == PipelineCollation.DEFAULT || collation == PipelineCollation.ASC) {
-                            DSL.field("convert({0} USING gbk)", it).asc()
+                            it.asc()
                         } else {
-                            DSL.field("convert({0} USING gbk)", it).desc()
+                            it.desc()
                         }
                     }
                 }

diff --git a/...process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineInfoDao.kt b/...process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineInfoDao.kt
@@ -345,9 +345,7 @@ class PipelineInfoDao {
                         )
                         PipelineSortType.NAME -> transferOrder(
                             PIPELINE_NAME,
-                            collation,
-                            { field -> DSL.field("convert({0} USING gbk)", String::class.java, field).desc() },
-                            { field -> DSL.field("convert({0} USING gbk)", String::class.java, field).asc() }
+                            collation
                         )
                         else -> transferOrder(
                             CREATE_TIME,