From 06ea3e5721995a4a4e1ae0db93d7f7dac1bfa162 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:20:05 +0800
Subject: [PATCH] 1.成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中 2.库存查询界面以及出库提取界面新增是否贴标搜索筛选功能
---
src/main/java/com/zy/asrs/controller/TagController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TagController.java b/src/main/java/com/zy/asrs/controller/TagController.java
index 8fd2db1..c5e92f0 100644
--- a/src/main/java/com/zy/asrs/controller/TagController.java
+++ b/src/main/java/com/zy/asrs/controller/TagController.java
@@ -35,7 +35,9 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)Long parentId){
EntityWrapper<Tag> wrapper = new EntityWrapper<>();
- wrapper.eq("parent_id", parentId==null?getOriginTag().getId():parentId);
+ if(!Cools.isEmpty(parentId)) {
+ wrapper.eq("parent_id", parentId == null ? getOriginTag().getId() : parentId);
+ }
wrapper.orderBy("sort");
List<Tag> tags = tagService.selectList(wrapper);
return R.ok().add(tags);
--
Gitblit v1.9.1