Merge remote-tracking branch 'origin/master' into ywx

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

         <if test="question.directorid!=null and question.directorid!='0'.toString() and question.directorid!=''">
             and qd.directorid=#{question.directorid}
         </if>
-        <if test="question.qtypeid!=null and question.qtypeid!='0'.toString() and question.qtypeid!=''">
-            and q.qtypeid=#{question.qtypeid}
+        <if test="question.hashear!=null and question.hashear == 1">
+            and q.hashear=1
+        </if>
+        <if test="question.hashear!=1 and question.qtypeid!=null and question.qtypeid!='0'.toString() and question.qtypeid!=''">
+            and q.hashear=0 and q.qtypeid=#{question.qtypeid}
         </if>
         <if test="question.belong!=null and question.belong!=0">
             <if test="question.belong==4 or question.belong==6">