From 31e23deb9ae71263fb59fcd82c26b22c9cdfc3d4 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 14 六月 2025 15:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after

---
 basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
index e01e082..67a6c5e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalFieldServiceImpl.java
@@ -39,8 +39,8 @@
     @Override
     public IPage<CoalField> selectCoalFieldList(Page page, CoalFieldDto coalFieldDto) {
         LambdaQueryWrapper<CoalField> queryWrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.hasText(coalFieldDto.getFieldName())) {
-            queryWrapper.like(CoalField::getFieldName, coalFieldDto.getFieldName());
+        if (StringUtils.hasText(coalFieldDto.getSearchAll())) {
+            queryWrapper.like(CoalField::getFieldName, coalFieldDto.getSearchAll());
         }
         queryWrapper.orderByDesc(CoalField::getCreateTime);
         return coalFieldMapper.selectPage(page, queryWrapper);

--
Gitblit v1.9.3