diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index bfee6fe..cfc1b69 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -196,7 +196,19 @@ public class BackApplyServiceImpl implements BackApplyService { // return getMaTypeDetails(view); List view = backApplyMapper.getBackCheckView(bean); // 移出taskStatus等于39(未完成),并且maStatus不等于16的数据 - view.removeIf(item -> "39".equals(item.getTaskStatus()) && !"16".equals(item.getMaStatus())); +// view.removeIf(item -> "39".equals(item.getTaskStatus()) && item.getMaStatus() != null && !"16".equals(item.getMaStatus())); + // 存储已经处理过的 typeId + Set processedTypeIds = new HashSet<>(); + for (BackApplyInfo info : view) { + String typeId = info.getTypeId(); + if (processedTypeIds.contains(typeId)) { + // 如果 typeId 已处理过,将 remark 置为 null + info.setRemark(null); + } else { + // 首次遇到该 typeId,标记为已处理 + processedTypeIds.add(typeId); + } + } return view; }