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

src/main/resources/EPaperVerifyMapper.xml

@@ -58,7 +58,9 @@
     <!--识别跳过-->
     <update id="correctSkip">
         UPDATE e_paper_student0608 ps LEFT JOIN e_paper_student ps2 ON ps.epsid=ps2.epsid
-        SET ps.verified=#{ps.verified},ps.samed=1,ps2.verified=#{ps.verified} WHERE ps.epid=#{ps.epid} and ps.studentid=#{ps.studentid}
+        SET ps.verified=#{ps.verified},ps.samed=1
+        <if test="ps.verified!=null and ps.verified==1">,ps2.verified=#{ps.verified}</if>
+        WHERE ps.epid=#{ps.epid} and ps.studentid=#{ps.studentid}
     </update>
 
     <!--获取原试卷中试题正确答案-->