From 4aff6ce5a44047245f86e776d3b6b67314aed70e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 26 十二月 2025 14:55:17 +0800
Subject: [PATCH] 增加库区配置,合并通知单、及流程和设备配置

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
index 4c122d3..d188b13 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
@@ -61,6 +61,10 @@
         if (param.getStart() != null && param.getEnd() != null) {
             queryWrapper.between("time", param.getStart(), param.getEnd());
         }
+        //浜嬩欢鍚嶇О
+        if (StringUtils.isNotBlank(param.getName())) {
+            queryWrapper.like("name", param.getName());
+        }
 
         queryWrapper.orderByDesc("create_time");
 
@@ -78,6 +82,9 @@
         }
 
         QueryWrapper<EventInfo> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(param.getCompanyId())) {
+            queryWrapper.eq("company_id", param.getCompanyId());
+        }
         if (StringUtils.isNotBlank(param.getDeptId())) {
             queryWrapper.likeRight("dept_id", param.getDeptId());
         }

--
Gitblit v1.9.3