Revert "Revert "修正排序錯誤""

This reverts commit a36a7ab7dc61d5869539bb5260f2dce86717feac.
Revert "Revert "修正錯誤""

This reverts commit 3c4d690fdfae31008e586e4dc90c20a0201338d3.