Merge remote-tracking branch 'origin/featCnbg-supervFilter-20250325' into cnbg-master

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

@@ -2315,8 +2315,12 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
           List<WmTaskSupervisionAdvice> supervisionAdvices =
               advices.get(wmTaskSupervision.getSupervisionId());
           if (CollUtil.isNotEmpty(supervisionAdvices) && supervisionAdvices.size() > 1) {
-            WmTaskSupervisionAdvice advice = supervisionAdvices.get(1);
-            datas[i][j] = advice != null ? advice.getRemarks() : "";
+            int idx = 1;
+            WmTaskSupervisionAdvice advice = supervisionAdvices.get(idx);
+            while(idx < supervisionAdvices.size() && advice.getCreateBy().equals(supervisionAdvices.get(0).getCreateBy())) {
+                advice = supervisionAdvices.get(++idx);
+            }
+            datas[i][j] = advice != null && !advice.getCreateBy().equals(supervisionAdvices.get(0).getCreateBy()) ? advice.getRemarks() : "";
           } else {
             datas[i][j] = "";
           }