From 3f5396e3471f90dfd82be739b67620bc942dc2a3 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Fri, 29 Aug 2025 14:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=BD=E5=B7=A5=E4=BA=A7?=
 =?UTF-8?q?=E5=80=BC=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OutConstructionValueServiceImpl.java        | 12 +++++++++++-
 .../BusUserProjectRelevancyController.java           |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java
index 263e0f2b..a88c9254 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java
@@ -25,6 +25,7 @@ import org.dromara.out.service.IOutConstructionValueService;
 import org.dromara.progress.domain.PgsProgressCategory;
 import org.dromara.progress.domain.vo.progresscategory.PgsProgressCategoryVo;
 import org.dromara.progress.service.IPgsProgressCategoryService;
+import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.vo.project.BusProjectVo;
 import org.dromara.project.service.IBusProjectService;
 import org.springframework.context.event.EventListener;
@@ -54,6 +55,8 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
 
     private final IPgsProgressCategoryService pgsProgressCategoryService;
 
+    private final IBusProjectService projectService;
+
     /**
      * 查询施工产值
      *
@@ -100,7 +103,14 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<OutConstructionValue> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(OutConstructionValue::getId);
-        lqw.eq(bo.getProjectId() != null, OutConstructionValue::getProjectId, bo.getProjectId());
+        Long projectId = bo.getProjectId();
+        if (projectId != null) {
+            // 获取子项目列表
+            List<BusProject> subProjectIds = projectService.lambdaQuery()
+                .eq(BusProject::getPId, projectId)
+                .list();
+            lqw.in(OutConstructionValue::getProjectId, projectId, subProjectIds);
+        }
         lqw.eq(bo.getMatrixId() != null, OutConstructionValue::getMatrixId, bo.getMatrixId());
         lqw.eq(bo.getProgressCategoryId() != null, OutConstructionValue::getProgressCategoryId, bo.getProgressCategoryId());
         lqw.eq(bo.getArtificialNum() != null, OutConstructionValue::getArtificialNum, bo.getArtificialNum());
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
index 97c4f3d7..f23a6cba 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
@@ -63,7 +63,6 @@ public class BusUserProjectRelevancyController extends BaseController {
     /**
      * 查询登录用户与项目关联分页
      */
-    @SaCheckPermission("project:projectRelevancy:loginPage")
     @GetMapping("/login/page")
     public TableDataInfo<BusUserProjectRelevancyVo> pageByLoginUser(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();