Merge branch 'dev-v5.2' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -395,9 +395,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 //遍历正文
                 while (i<paragraphList.size())
                 {
+
                     content = paragraphList.get(i).getText();
                     System.out.println(content);
-                    System.out.println("AQW");
+                    System.out.println("AQW"+paragraphList.get(i).getPictureText());
                    if(Validator.isNotEmpty(content)){
                        content =dealTxt(content);
                        if(content.startsWith("注意事项")){

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamWrongRecordServiceImpl.java

@@ -152,7 +152,8 @@ public class UserExamWrongRecordServiceImpl extends ServiceImpl<UserExamWrongRec
     public Boolean remove_question(UserExamWrongRecordQueryBo bo) {
         return this.remove(new LambdaQueryWrapper<UserExamWrongRecord>()
                 .eq(UserExamWrongRecord::getQuestionId,bo.getQuestionId())
-                .eq(UserExamWrongRecord::getOrderGoodsId,bo.getOrderGoodsId())
+                .eq(Validator.isNotEmpty(bo.getGoodsId()),UserExamWrongRecord::getGoodsId,bo.getGoodsId())
+                .eq(Validator.isNotEmpty(bo.getOrderGoodsId()),UserExamWrongRecord::getOrderGoodsId,bo.getOrderGoodsId())
                 .eq(UserExamWrongRecord::getExamId,bo.getExamId())
                 .eq(UserExamWrongRecord::getUserId,bo.getUserId()));
     }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -257,21 +257,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 									   user_exam_record
 								   WHERE
 									   user_id = #{userId}
-									 AND goods_id = #{goodsId}
+									 AND order_goods_id = #{orderGoodsId}
 								   GROUP BY
 									   exam_id)) uer on uer.exam_id = e.exam_id
 		WHERE
 			ga.goods_id = #{goodsId}
 		  AND ((
 					   ga.type = 3
-					   AND ga.major_id IN ( SELECT exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id = 0 AND chapter_exam_id = 0 GROUP BY exam_id )
+					   AND ga.major_id IN ( SELECT exam_id FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} AND module_exam_id = 0 AND chapter_exam_id = 0 GROUP BY exam_id )
 					   AND e.STATUS = 1
 				   )
 			OR (
 					   ga.type = 2
-					   AND ga.major_id IN ( SELECT chapter_exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id = 0 AND chapter_exam_id > 0 GROUP BY chapter_exam_id ))
+					   AND ga.major_id IN ( SELECT chapter_exam_id FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} AND module_exam_id = 0 AND chapter_exam_id > 0 GROUP BY chapter_exam_id ))
 			OR (
 					   ga.type = 1
-					   AND ga.major_id IN ( SELECT module_exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id > 0 GROUP BY module_exam_id )))
+					   AND ga.major_id IN ( SELECT module_exam_id FROM user_exam_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} AND module_exam_id > 0 GROUP BY module_exam_id )))
 	</select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamWrongRecordMapper.xml

@@ -72,6 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY
         e.exam_id
+        ORDER BY
+        e.create_time desc
     </select>
 
     <select id="selectQuestionList" parameterType="com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo" resultMap="UserExamWrongRecordVoResult">