From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
index b4463ec..26c57c1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
@@ -38,6 +38,14 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
}
+
+ if (StringUtils.isNotBlank(param.getUserName())) {
+ queryWrapper.like("user_name", param.getUserName());
+ }
+ if (StringUtils.isNotBlank(param.getConfName())) {
+ queryWrapper.like("conf_name", param.getConfName());
+ }
+
queryWrapper.orderByDesc("create_time");
return queryWrapper;
--
Gitblit v1.9.3