From 3ff680c755e797879d0629efec67f109d233a857 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期三, 23 七月 2025 11:05:34 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/MatController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java index 53e9135..3c0bc86 100644 --- a/src/main/java/com/zy/asrs/controller/MatController.java +++ b/src/main/java/com/zy/asrs/controller/MatController.java @@ -64,7 +64,7 @@ EntityWrapper<Mat> wrapper = new EntityWrapper<>(); if (!Cools.isEmpty(condition)) { // wrapper.like("matnr", condition).or().like("maktx", condition); - wrapper.like("matnr", condition).or().like("specs", condition); + wrapper.like("matnr", condition).or().like("maktx", condition).or().like("model", condition); } wrapper.orderBy("create_time", false); List<Mat> mats = matService.selectList(wrapper); @@ -98,7 +98,9 @@ , String.valueOf(tagId) , param.get("matnr") , param.get("maktx") - , param.get("specs")) + , param.get("specs") + , param.get("model")) + ); } @@ -317,7 +319,7 @@ @ManagerAuth public R getMatDataKV(@RequestParam(required = false) String condition) { Wrapper<Mat> wrapper = new EntityWrapper<Mat>() - .andNew().like("matnr", condition).or().like("maktx", condition) + .andNew().like("matnr", condition).or().like("maktx", condition).or().like("model",condition) .orderBy("create_time", false); List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords(); List<KeyValueVo> valueVos = new ArrayList<>(); -- Gitblit v1.9.1