소스 검색

skip the row totally

dengjia 2 달 전
부모
커밋
1b422a8a1b
1개의 변경된 파일7개의 추가작업 그리고 6개의 파일을 삭제
  1. 7 6
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

+ 7 - 6
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -2245,14 +2245,15 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
       }
 
       WmTaskSupervision wmTaskSupervision = taskSupervisions.get(i - 2);
+
+      boolean rejectedByLeader =
+            advices.get(wmTaskSupervision.getSupervisionId())
+            .stream().filter(adv -> adv.getTaskSupervisionContent() != null && !adv.getAdviceResult())
+            .findFirst().isPresent();
+
       // 列的长度每次都变化。每次都要重新申请空间(长度)
       for (int j = 0; j < datas[i].length; j++) {
 
-        boolean rejectedByLeader =
-              advices.get(wmTaskSupervision.getSupervisionId())
-              .stream().filter(adv -> adv.getTaskSupervisionContent() != null && !adv.getAdviceResult())
-              .findFirst().isPresent();
-
         // 服务ID
         if (j == 0) {
           datas[i][j] = wmTaskSupervision.getTaskId().toString();
@@ -2480,7 +2481,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
     //     idx++;
     // }
 
-    return datas;
+    return Arrays.stream(datas).filter(data -> StrUtil.isNotEmpty(data[13].toString())).toArray(Object[][]::new);
   }
 
   //     @Transactional(rollbackFor = Exception.class)