Merge pull request 'fix:任务终审排序bug' (#131) from fix/Final_list_sort into test

Reviewed-on: #131

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

@@ -1009,12 +1009,17 @@
         </if>
         <if test="page != null">
             <if test="page.sortname != null">
-                <if test="page.sortname == 'states'">
-                    order by tcp.${page.sortname} ${page.sortorder}
-                </if>
-                <if test="page.sortname != 'states'">
-                    ORDER BY CONVERT(pic.${page.sortname} USING gbk) COLLATE gbk_chinese_ci ${page.sortorder}
-                </if>
+                <choose>
+                    <when test="page.sortname == 'states'">
+                        ORDER BY tcp.${page.sortname} ${page.sortorder}
+                    </when>
+                    <when test="page.sortname == 'field1'">
+                        ORDER BY CONVERT(pic.${page.sortname} USING gbk) COLLATE gbk_chinese_ci ${page.sortorder}
+                    </when>
+                    <otherwise>
+                        ORDER BY pic.${page.sortname} ${page.sortorder}
+                    </otherwise>
+                </choose>
             </if>
             limit ${page.start}, ${page.Pagesize}
         </if>