From c6fdc1e8ec03c93977de6ddbebf84613c7d8b26e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 31 十二月 2025 14:30:47 +0800
Subject: [PATCH] 统一库区及公司列表方法
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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..ee97820 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
@@ -58,8 +58,15 @@
queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
}
//鎶撴媿鏃堕棿妫�绱�
- if (param.getStart() != null && param.getEnd() != null) {
- queryWrapper.between("time", param.getStart(), param.getEnd());
+ if (null != param.getStart()) {
+ queryWrapper.ge("time", param.getStart());
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("time", param.getEnd());
+ }
+ //浜嬩欢鍚嶇О
+ if (StringUtils.isNotBlank(param.getName())) {
+ queryWrapper.like("name", param.getName());
}
queryWrapper.orderByDesc("create_time");
@@ -78,6 +85,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