From ee02f5032743f3c0bd217cb6cf8ba03ee663c629 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 10:16:31 +0800
Subject: [PATCH] 修改PeopleSea.java文件

---
 zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
index fc95c11..eb9b60a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
@@ -5,9 +5,10 @@
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.MapUtils;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.domain.ZfEvent;
 import com.ruoyi.domain.dto.zfEventdto;
-import com.ruoyi.domain.peopleSea;
+import com.ruoyi.domain.PeopleSea;
 import com.ruoyi.service.PeopleSearchService;
 import com.ruoyi.service.ZfEventService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,7 @@
     private ZfEventService zfEventService;
 
 
-    private LambdaQueryWrapper<peopleSea> buildCondition(peopleSea peops) {
+    private LambdaQueryWrapper<PeopleSea> buildCondition(PeopleSea peops) {
 
         return null;
 //        if(peops.getModule().equals("浜嬬邯")) {
@@ -44,7 +45,7 @@
 
     @Override
 
-    public AjaxResult selectDataList(peopleSea peopleS, Integer pageNum, Integer pageSize) {
+    public AjaxResult selectDataList(PeopleSea peopleS, Integer pageNum, Integer pageSize) {
 
         System.out.println(peopleS.getModules().toString());
         for(String thi: peopleS.getModules()) {
@@ -62,14 +63,21 @@
                 for (String pe : pes) {
                     lqw.like(ZfEvent::getPeople, pe);
                 }
+                peopleS.setIsHIde("鍚�");
+                lqw.eq(!StringUtils.isEmpty(peopleS.getIsHIde()), ZfEvent::getIsHide, "鍚�");
+
                 lqw.between(peopleS.getStartTime() != null && peopleS.getEndTime() != null, ZfEvent::getHappenTime, peopleS.getStartTime(), peopleS.getEndTime());
-                if(peopleS.getHasAttachment().equals("鏄�"))
+                if(peopleS.getHasAttachment()!=null&&peopleS.getHasAttachment().equals("鏄�"))
                 {
-                    lqw.isNotNull(ZfEvent::getUrl);
+                    System.out.println("not null!");
+                    lqw.isNotNull(ZfEvent::getUrl).and(r->r.apply("url!=''"));
+                }else
+                {
+                    lqw.eq(!StringUtils.isEmpty(peopleS.getHasAttachment()), ZfEvent::getUrl, "");
+
                 }
-
-
-                Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
+              //  if(peopleS.getIsHIde()!=null)
+               Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
                 Page<ZfEvent> pageResult = zfEventService.page(zfEventPage, lqw);
 
                 List<ZfEvent> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�

--
Gitblit v1.9.1