Merge branch 'develop' into 标准版

jack
2 parents c18bee1c a5456137
Showing 1 changed file with 1 additions and 0 deletions
resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -265,6 +265,7 @@
 		<if test="COMPLETE_PERSENT != null and COMPLETE_PERSENT != ''"><!-- 关键词检索 -->
 			and COMPLETE_PERSENT = #{COMPLETE_PERSENT}
 		</if>
+		AND ( IS_DELETE != '1' or IS_DELETE is NULL )
 		ORDER BY COMPLETE_DATE DESC
 	</select>