merge

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

@@ -84,12 +84,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
     @Override
     public List<ExamVo> getList(ExamQueryBo bo) {
         List<ExamVo> list = examMapper.getList(bo);
-        if (ObjectUtils.isNotNull(bo.getExclude()) && bo.getExclude() == 1){
-            //排除随机练习和每日一练试卷类型
-            List<String> paperNames = Arrays.asList("每日一练", "随机练习");
-            list = list.stream().filter(x -> StringUtils.isBlank(x.getPaperName())
-                     || !paperNames.contains(x.getPaperName())).collect(Collectors.toList());
-        }
         return list;
     }
 

zhongzheng-system/src/main/resources/mapper/modules/bank/ExamMapper.xml

@@ -147,6 +147,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="key != null and key != ''">
             AND (e.exam_name  like concat('%', #{key}, '%') or e.prefix_name  like concat('%', #{key}, '%') or e.code = #{key})
         </if>
+        <if test="exclude != null and exclude == 1">
+            AND ep.paper_name NOT IN('每日一练','随机练习')
+        </if>
         ORDER BY e.exam_id DESC
     </select>