diff --git a/src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java b/src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java index a725a349d..ac3abc1bd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java @@ -29,7 +29,7 @@ import java.util.Map; * @version: V1.0 */ @RestController -@RequestMapping("/xmgl/InspectTaskItemRecord") +@RequestMapping("/xmgl/inspectTaskItemRecord") @Slf4j @Api(tags = "检查任务-子任务") public class InspectTaskItemRecordController { diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java index 7deb54d52..add742da8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java @@ -342,11 +342,11 @@ public class DangerTypeRecordController { return vo; }).collect(Collectors.toList()); records.addAll(recordVos); - if (StrUtil.isNotBlank(projectClassify)) { - records = records.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList()); - } records = records.stream().sorted(Comparator.comparing(TopProjectClassifyTypeRecordTreeVo::getId)).collect(Collectors.toList()); List vos = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(records)), "id", "parentId", "children"), TopProjectClassifyTypeRecordTreeVo.class); + if (StrUtil.isNotBlank(projectClassify)) { + vos = vos.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList()); + } return Result.success(vos); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java index c3cef25a7..3109c456a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java @@ -145,6 +145,9 @@ public class QualityRegionServiceImpl extends ServiceImpl enterpriseIdMap.get(Convert.toLong(key))).filter(Objects::nonNull).map(EnterpriseInfo::getEnterpriseName).collect(Collectors.joining(","))); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java index 1b421c129..6fb8c841e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java @@ -342,11 +342,11 @@ public class XzSecurityDangerTypeRecordController { return vo; }).collect(Collectors.toList()); records.addAll(recordVos); - if (StrUtil.isNotBlank(projectClassify)) { - records = records.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList()); - } records = records.stream().sorted(Comparator.comparing(TopProjectClassifyTypeRecordTreeVo::getId)).collect(Collectors.toList()); List vos = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(records)), "id", "parentId", "children"), TopProjectClassifyTypeRecordTreeVo.class); + if (StrUtil.isNotBlank(projectClassify)) { + vos = vos.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList()); + } return Result.success(vos); }