From 57a39ad7274834b571e507cd3c324e99634b56a6 Mon Sep 17 00:00:00 2001 From: zt Date: Mon, 25 Aug 2025 20:13:30 +0800 Subject: [PATCH] =?UTF-8?q?bug=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/land/controller/BusEnterRoadController.java | 1 + .../org/dromara/land/controller/BusLandBlockController.java | 1 + .../service/impl/MatMaterialsInventoryServiceImpl.java | 3 +++ 3 files changed, 5 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusEnterRoadController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusEnterRoadController.java index df269292..a8a8cfe4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusEnterRoadController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusEnterRoadController.java @@ -129,6 +129,7 @@ public class BusEnterRoadController extends BaseController { } + @SaCheckPermission("land:enterRoad:add") @PostMapping("upload/{projectId}") public R upload(MultipartFile file, @NotNull(message = "所属项目不明确") @PathVariable Long projectId) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandBlockController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandBlockController.java index c6ffe773..0b7e8c1b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandBlockController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandBlockController.java @@ -118,6 +118,7 @@ public class BusLandBlockController extends BaseController { return toAjax(busLandBlockService.deleteWithValidByIds(List.of(ids), true)); } + @SaCheckPermission("land:landBlock:add") @PostMapping("upload/{projectId}") public R upload(MultipartFile file,@NotNull(message = "所属项目不明确") @PathVariable Long projectId) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java index 8c9b26ca..f9e4b83d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java @@ -414,6 +414,9 @@ public class MatMaterialsInventoryServiceImpl extends ServiceImpl selectLatestByMaterialIds(List materialIds) { + if (CollUtil.isEmpty(materialIds)) { + return new ArrayList<>(); + } return baseMapper.selectLatestByMaterialIds(materialIds); } }