yangdamao 3 anni fa
parent
commit
f2e5c18030

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
@@ -82,9 +83,11 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
     @Override
     public List<ExamVo> getList(ExamQueryBo bo) {
         List<ExamVo> list = examMapper.getList(bo);
-        if (ObjectUtils.isNull(bo.getExclude()) || bo.getExclude() == 0){
-            //默认排除随机练习和每日一练试卷类型
-            list = list.stream().filter(x -> !x.getPaperName().equals("每日一练") ||  !x.getPaperName().equals("随机练习")).collect(Collectors.toList());
+        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;
     }