fix

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/MarkTaskApi.java

@@ -146,9 +146,9 @@ public class MarkTaskApi {
     @RequestMapping(method = RequestMethod.GET)
     public PageableDTO list(@RequestParam Long markerId, @RequestParam Long workId, @RequestParam MarkStage stage,
             @RequestParam(required = false) Boolean isSample, @RequestParam(defaultValue = "false") Boolean reject,
-            @RequestParam(required = false) String level, @RequestParam(required = false) String sn,
-            @RequestParam Long questionId, @RequestParam(required = false) String areaCode, Pageable pageable)
-            throws Exception {
+            @RequestParam(required = false) String level, @RequestParam(required = false) String todoLevel,
+            @RequestParam(required = false) String sn, @RequestParam Long questionId,
+            @RequestParam(required = false) String areaCode, Pageable pageable) throws Exception {
         List<MarkTaskDTO> markTaskDTOs = new ArrayList<>();
         MarkUser markUser = markUserRepo.findOne(markerId);
         Long batchNo = null;
@@ -183,6 +183,9 @@ public class MarkTaskApi {
             predicates.add(builder.equal(root.get("stage"), stage));
             if (level == null) {
                 predicates.add(builder.isNull(root.get("result")));
+                if (todoLevel != null) {
+                    onPredicates.add(builder.equal(join.get("level"), todoLevel));
+                }
                 if (stage == MarkStage.SCORE) {
                     onPredicates.add(builder.equal(join.get("isShift"), false));
                     onPredicates.add(builder.equal(join.get("isShiftScore"), false));