From ebeecf61232967a9c21ca4aa63ccec8e269b8c0e Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 29 九月 2025 09:13:58 +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 |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 678cc12..162a928 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
@@ -23,13 +23,20 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-
+/**
+ * 銆愭浠堕」鐩俊鎭�慡ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2025-07-26
+ */
 @Service
 public class ArchiveProjectNameServiceImpl extends ServiceImpl<ArchiveProjectNameMapper, ArchiveProjectName> implements IArchiveProjectNameService {
 
     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