From 273d186f2b2575f409c832296644b608de65680a Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 2 Dec 2025 16:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=B4=A8=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/InspectTaskItemRecordController.java         | 2 +-
 .../quality/controller/DangerTypeRecordController.java      | 6 +++---
 .../quality/service/impl/QualityRegionServiceImpl.java      | 3 +++
 .../controller/XzSecurityDangerTypeRecordController.java    | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

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<TopProjectClassifyTypeRecordTreeVo> 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<QualityRegionMapper, Q
             }
             if (Objects.equals(securityType, 2)) {
                 //质量
+                qualityRegion.setSecurityEnterpriseIds(qualityRegion.getQualityEnterpriseIds());
+                qualityRegion.setSecurityDutyIds(qualityRegion.getQualityDutyIds());
+                qualityRegion.setSecurityReviewIds(qualityRegion.getQualityReviewIds());
                 if (StrUtil.isNotBlank(qualityRegion.getQualityEnterpriseIds())) {
                     qualityRegion.setEnterpriseNames(StrUtil.split(qualityRegion.getQualityEnterpriseIds(), ",").stream().map(key -> 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<TopProjectClassifyTypeRecordTreeVo> 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);
     }