Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -52,7 +52,7 @@
                 m.parent_question = #{myId}
             </foreach>
         </if>
-        <if test="sexType != null">
+        <if test="sexType != null and sexType != 3 and sexType != ''">
             and t.sex_type in (3, #{sexType})
         </if>
         <if test="age != null">

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -221,7 +221,7 @@
                 m.parent_question = #{myId}
             </foreach>
         </if>
-        <if test="sexType != null">
+        <if test="sexType != null and sexType != 3 and sexType != ''">
             and t.sex_type in (3, #{sexType})
         </if>
         <if test="age != null">