Merge branch 'dev' of GameCenter/game-center into master

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -1292,7 +1292,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isBlank(dto.getSortFiled())) {
             orderCri.getOrderBy().orderBy("dt", dto.getSortType());
         } else {
-            orderCri.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
+            orderCri.getOrderBy().orderBy(com.zanxiang.game.data.serve.utils.StringUtils.camelToSnake(dto.getSortFiled()), dto.getSortType());
         }
         //列表sql
         String gameCountryRoleListSql = getChatListSql(criA, orderCri);
@@ -1371,7 +1371,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isBlank(dto.getSortFiled())) {
             orderCri.getOrderBy().orderBy("dt", dto.getSortType());
         } else {
-            orderCri.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
+            orderCri.getOrderBy().orderBy(com.zanxiang.game.data.serve.utils.StringUtils.camelToSnake(dto.getSortFiled()), dto.getSortType());
         }
         //列表sql
         String gameCountryRoleListSql = getChatDetailListSql(criA, orderCri);

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/utils/StringUtils.java

@@ -0,0 +1,30 @@
+package com.zanxiang.game.data.serve.utils;
+
+/**
+ * packageName com.zanxiang.game.data.serve.utils
+ *
+ * @author ZhangXianyu
+ * @date 2025/5/7
+ * @description TODO
+ */
+public class StringUtils {
+
+    /**
+     * 转驼峰转下划线
+     * @param camelCase
+     * @return
+     */
+    public static String camelToSnake(String camelCase) {
+        if (camelCase == null || camelCase.isEmpty()) {
+            return camelCase;
+        }
+        // 处理连续大写字母（如 "HTTPRequest" → "HTTP_Request"）
+        String step1 = camelCase.replaceAll("([A-Z]+)([A-Z][a-z])", "$1_$2");
+        // 处理小写后跟大写字母（如 "userName" → "user_Name"）
+        String step2 = step1.replaceAll("([a-z])([A-Z])", "$1_$2");
+        // 统一转小写并用下划线连接
+        return step2.toLowerCase().replace(' ', '_');
+    }
+
+
+}