Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/twzd

twzd-service/src/main/resources/mapper/qustion/QuestionInfoMapper.xml

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
 
         <if test="isRand!=null and isRand!=''"> order by rand() </if>
-        <if test="isRand==null or isRand=='' and  sort!=null and sort!='' "> order by ${sort} </if>
+        <if test="isRand==null or isRand=='' and  sort!=null and sort!='' "> order by IFNULL(${sort},10000) </if>
     </select>