From dfd2060bdcc0de929b4770a6a4a580c17bd72104 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 17 十二月 2025 16:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
index 2a4acd5..eafab22 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
@@ -44,16 +44,13 @@
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
+ //搴撳尯妫�绱�
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
}
-
- if (StringUtils.isNotBlank(param.getDepotId())) {
- queryWrapper.eq("depot_id", param.getDepotId());
- }
- //鏍囩妫�绱�
+ // 鏀跺偍鍏徃妫�绱�
if (StringUtils.isNotBlank(param.getKey())) {
- queryWrapper.like("tags", param.getKey());
+ queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
}
//鎶撴媿鏃堕棿妫�绱�
if (param.getStart() != null && param.getEnd() != null) {
--
Gitblit v1.9.3