Эх сурвалжийг харах

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

dengjia 2 сар өмнө
parent
commit
8dd3280bf5

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

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