Merge pull request 'fix:提报人排序' (#124) from fix/List_of_applicants into test

Reviewed-on: #124

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -1007,13 +1007,8 @@
                     order by tcp.${page.sortname} ${page.sortorder}
                 </if>
                 <if test="page.sortname != 'states'">
-                    order by pic.${page.sortname} ${page.sortorder}
+                    ORDER BY CONVERT(pic.${page.sortname} USING gbk) COLLATE gbk_chinese_ci ${page.sortorder}
                 </if>
-<!--                <if test="page.sortname != 'states'">-->
-<!--                    order by CONVERT(LEFT(pic.${page.sortname}, 1) USING gbk) ${page.sortorder},-->
-<!--                    CONVERT(SUBSTRING(pic.${page.sortname}, 2, 1) USING gbk) ${page.sortorder},-->
-<!--                    CONVERT(SUBSTRING(pic.${page.sortname}, 3, 1) USING gbk) ${page.sortorder}-->
-<!--                </if>-->
             </if>
             limit ${page.start}, ${page.Pagesize}
         </if>