Merge branch 'dev_v2.1.0' into release_v2.1.0

merge

teachcloud-report-business/src/main/resources/mapper/TAExamCourseCollegeTeacherMapper.xml

@@ -119,7 +119,14 @@
             </if>
         </where> ) t
             <if test="column != null and column != '' and order != null and order != ''">
-                order by t.${column} ${order}
+                <choose>
+                    <when test="column != null and column == 'inspectCollegeName'">
+                        order by t.${column} ${order},t.rank ${order}
+                    </when>
+                    <otherwise>
+                        order by t.${column} ${order}
+                    </otherwise>
+                </choose>
             </if>
     </select>
 
@@ -187,7 +194,14 @@
             </if>
         </where> ) t
         <if test="column != null and column != '' and order != null and order != ''">
-            order by t.${column} ${order}
+            <choose>
+                <when test="column != null and column == 'inspectCollegeName'">
+                    order by t.${column} ${order},t.rank ${order}
+                </when>
+                <otherwise>
+                    order by t.${column} ${order}
+                </otherwise>
+            </choose>
         </if>
     </select>
 </mapper>