From 1eddf64a7104dcd06065e8ac309eebc42c24fb05 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 14:29:56 +0800
Subject: [PATCH] 出入库记录导入，判重兜底校验纠正
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 e0cf3c9..f1d15b6 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
@@ -63,8 +63,12 @@
queryWrapper.le("time", param.getEnd());
}
//浜嬩欢鍚嶇О
+// if (StringUtils.isNotBlank(param.getName())) {
+// queryWrapper.like("name", param.getName());
+// }
+ //浜嬩欢鏍囩
if (StringUtils.isNotBlank(param.getName())) {
- queryWrapper.like("name", param.getName());
+ queryWrapper.like("tags", param.getName());
}
queryWrapper.orderByDesc("create_time");
@@ -83,9 +87,13 @@
}
QueryWrapper<EventInfo> queryWrapper = new QueryWrapper<>();
- if (StringUtils.isNotBlank(param.getCompanyId())) {
- queryWrapper.eq("company_id", param.getCompanyId());
+
+
+ if (StringUtils.isBlank(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
}
+ queryWrapper.eq("company_id", param.getCompanyId());
+
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.likeRight("dept_id", param.getDeptId());
}
--
Gitblit v1.9.3