From 0a5cef4f6fea9fa7fa1445cffcb3f1b4594dc9f2 Mon Sep 17 00:00:00 2001 From: my_ong <429426262@qq.com> Date: Sun, 9 Mar 2025 15:54:33 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=A0=B9=E6=8D=AE=E8=B5=8B=E7=A0=81?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/material/MaterialController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/tech/riemann/ims/controller/platform/material/MaterialController.java b/src/main/java/tech/riemann/ims/controller/platform/material/MaterialController.java index c5fa92e..0f3ad5c 100644 --- a/src/main/java/tech/riemann/ims/controller/platform/material/MaterialController.java +++ b/src/main/java/tech/riemann/ims/controller/platform/material/MaterialController.java @@ -80,10 +80,16 @@ public class MaterialController { @PostMapping("material/list") @Operation(summary = "查询所有物料列表") - public List all(@Parameter(description = "类型") @RequestParam(required = false, defaultValue = "") String type) { + public List all(@Parameter(description = "类型") @RequestParam(required = false, defaultValue = "") String type, + @Parameter(description = "是否赋码") @RequestParam(required = false) Boolean assignRule) { String[] types = StringUtils.isNotBlank(type) ? type.split(",") : new String[0]; - List materials = materialService.queryLikeRight(List.of(types)); - materials.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType()))); + List materials = materialService.queryLikeRight(List.of(types)); + if (Boolean.FALSE.equals(assignRule)) { + materials.stream().filter(item -> Boolean.TRUE.equals(item.getAssignRule())) + .forEach(item -> item.setTypeName(typeService.getTypeName(item.getType()))); + } else { + materials.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType()))); + } return materials; }