From 27f5356ba11e2400aac493502f1c5ba1fb47775b Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期二, 14 十月 2025 16:55:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveSystem

---
 archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
index c30000b..162a928 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
@@ -34,7 +34,9 @@
 
     private LambdaQueryWrapper<ArchiveProjectName> buildCondition(ArchiveProjectName archiveProjectName){
         LambdaQueryWrapper<ArchiveProjectName> lqw = new LambdaQueryWrapper<>();
-        lqw.like(!StringUtils.isEmpty(archiveProjectName.getName()), ArchiveProjectName::getName, archiveProjectName.getName());
+        lqw.like(!StringUtils.isEmpty(archiveProjectName.getCompanyName()), ArchiveProjectName::getCompanyName, archiveProjectName.getCompanyName())
+                .like(!StringUtils.isEmpty(archiveProjectName.getCreatePerson()), ArchiveProjectName::getCreatePerson, archiveProjectName.getCreatePerson())
+                .like(!StringUtils.isEmpty(archiveProjectName.getName()), ArchiveProjectName::getName, archiveProjectName.getName());
         lqw.orderByDesc(ArchiveProjectName::getCreateTime);
         System.out.println("ssssssssssssddd0000000000000000");
         return lqw;

--
Gitblit v1.9.1