|
@@ -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() : "";
|