From 0e92f8e57b7d93dfafd1da88bcae32070908cedc Mon Sep 17 00:00:00 2001 From: wanxiaoli Date: Mon, 18 May 2026 13:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/controller/AlgorithmModelController.java | 2 +- .../yfd/business/css/controller/MaterialController.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/business-css/src/main/java/com/yfd/business/css/controller/AlgorithmModelController.java b/business-css/src/main/java/com/yfd/business/css/controller/AlgorithmModelController.java index 7d87cc0..a973245 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/AlgorithmModelController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/AlgorithmModelController.java @@ -113,7 +113,7 @@ public class AlgorithmModelController { } if (versionTag != null && !versionTag.isEmpty()) qw.eq("version_tag", versionTag); if (isCurrent != null && !isCurrent.isEmpty()) qw.eq("is_current", isCurrent); - qw.orderByDesc("updated_at"); + qw.orderByDesc("is_current").orderByDesc("updated_at"); Page page = new Page<>(pageNum, pageSize, true); return algorithmModelService.page(page, qw); } diff --git a/business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java b/business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java index e6590b9..d9583e5 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/MaterialController.java @@ -146,13 +146,14 @@ public class MaterialController { @PreAuthorize("hasAuthority('material:export')") @Log(value = "导出物料", module = "物料管理") @GetMapping("/export") - public ResponseEntity exportMaterialsV2(@RequestParam String projectId, + public ResponseEntity exportMaterialsV2(@RequestParam(required = false) String projectId, @RequestParam(required = false) List ids, @RequestParam(required = false) String nameLike) { - if (projectId != null && !projectId.isBlank() && !"-1".equals(projectId)) { - projectAccessHelper.assertCanReadProject(projectId); + String pid = (projectId == null || projectId.isBlank()) ? "-1" : projectId; + if (!"-1".equals(pid)) { + projectAccessHelper.assertCanReadProject(pid); } - byte[] bytes = materialService.exportMaterialsV2(projectId, ids, nameLike); + byte[] bytes = materialService.exportMaterialsV2(pid, ids, nameLike); String fn = "materials.xlsx"; return ResponseEntity.ok() .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + fn)