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 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=BD=E5=B7=A5?= =?UTF-8?q?=E4=BA=A7=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 params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(OutConstructionValue::getId); - lqw.eq(bo.getProjectId() != null, OutConstructionValue::getProjectId, bo.getProjectId()); + Long projectId = bo.getProjectId(); + if (projectId != null) { + // 获取子项目列表 + List 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 pageByLoginUser(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery) { Long userId = LoginHelper.getUserId(); From e85bbca73b6a8b95cc91a9baae8139ae367ad9a1 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Fri, 29 Aug 2025 17:11:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/design/controller/DesSchemeController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java index 26a77812..c39485ac 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesSchemeController.java @@ -108,7 +108,7 @@ public class DesSchemeController extends BaseController { /** * 新增设计方案文件 */ - @SaCheckPermission("design:scheme:add") + @SaCheckPermission("design:scheme:upload") @Log(title = "设计方案", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/upload") @@ -119,7 +119,7 @@ public class DesSchemeController extends BaseController { /** * 修改设计方案文件 */ - @SaCheckPermission("design:scheme:edit") + @SaCheckPermission("design:scheme:update") @Log(title = "设计方案", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/update/{id}") From d7054d6f026d775e7ce18b6b3308e5a37a0a3f30 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 29 Aug 2025 18:17:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/tender/service/impl/BusBiddingPlanServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java index ab01aace..8aab0962 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java @@ -128,7 +128,7 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl