From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.java
index f43362f..dc554e4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.java
@@ -4,12 +4,10 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.equipment.UnionOutdoorLaborDynamicDto;
 import com.panzhihua.common.model.dtos.equipment.UnionOutdoorSiteDto;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_equipment.dao.UnionOutdoorServiceRangeMapper;
 import com.panzhihua.service_equipment.dao.UnionOutdoorSiteMapper;
-import com.panzhihua.service_equipment.model.dos.UnionOutdoorLaborDynamic;
 import com.panzhihua.service_equipment.model.dos.UnionOutdoorServiceRange;
 import com.panzhihua.service_equipment.model.dos.UnionOutdoorSite;
 import com.panzhihua.service_equipment.service.UnionOutdoorSiteService;
@@ -17,7 +15,6 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Slf4j
 @Service
@@ -39,7 +36,16 @@
         QueryWrapper<UnionOutdoorSite> unionOutdoorLaborDynamicQueryWrapper = new QueryWrapper<>();
         if (unionOutdoorSiteDto.getAreaCode()!=null)
             unionOutdoorLaborDynamicQueryWrapper.eq("area_code",unionOutdoorSiteDto.getAreaCode());
-        return R.ok( baseMapper.selectPage(page, unionOutdoorLaborDynamicQueryWrapper));
+        if (unionOutdoorSiteDto.getKeyWord()!=null)
+            unionOutdoorLaborDynamicQueryWrapper.and(wrapper -> wrapper.like("name", unionOutdoorSiteDto.getKeyWord())
+                    .or()
+                    .like("introduction", unionOutdoorSiteDto.getKeyWord())
+                    .or()
+                    .like("detailed_address", unionOutdoorSiteDto.getKeyWord()));
+
+        Page pageResult = baseMapper.selectPage(page, unionOutdoorLaborDynamicQueryWrapper);
+        pageResult.setTotal(pageResult.getRecords().size());
+        return R.ok(pageResult);
     }
 
     @Override

--
Gitblit v1.7.1