我的收藏-表头排序

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml

@@ -54,6 +54,20 @@
                 #{item}
             </foreach>
         </if>
-        order by occ.create_time desc
+        <if test="params.orderByField == 'serial_number' or params.orderByField == 'title'">
+            order by CONVERT( ${params.orderByField} USING gbk) COLLATE gbk_chinese_ci
+            <if test="params.orderBy != null and params.orderBy != ''">
+                ${params.orderBy}
+            </if>
+        </if>
+        <if test="params.orderByField == 'create_time'">
+            order by occ.create_time
+            <if test="params.orderBy != null and params.orderBy != ''">
+                ${params.orderBy}
+            </if>
+        </if>
+        <if test="params.orderByField == null or params.orderByField == ''">
+            order by occ.create_time desc
+        </if>
     </select>
-</mapper>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java

@@ -297,4 +297,4 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl<OnlCgformCollect
 			throw new JeroBootException("删除订阅信息失败！");
 		}
 	}
-}
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -4225,7 +4225,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         || "region".equals(orderByField)
                         || "technology_territory".equals(orderByField)){
 
-                    conditionSb.append(" order by " + "CONVERT("+orderByField +"USING gbk) COLLATE gbk_chinese_ci");
+                    conditionSb.append(" order by " + "CONVERT("+orderByField +" USING gbk) COLLATE gbk_chinese_ci");
                 }else if("issue_time".equals(orderByField)){
                     conditionSb.append(" order by " + (String) parameter.get("orderByField"));
                 }