From f8ade32067c7b2de5fb16de1463aa37698fcc7bf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 21 Feb 2023 09:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ChangeWelfareServiceImpl.java | 9 ++++++---
 .../src/main/resources/mapper/ChangeWelfareDao.xml       | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
index 9fd94f7a7f..1e6e5f6e01 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeWelfareServiceImpl.java
@@ -3,7 +3,6 @@ package com.epmet.service.impl;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -38,6 +37,8 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.redis.ChangeWelfareRedis;
 import com.epmet.service.ChangeWelfareService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.fileupload.FileItem;
@@ -96,9 +97,11 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
     @Override
     public PageData<ChangeWelfareDTO> page(Map<String, Object> params) {
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
-        IPage<ChangeWelfareDTO> page = getPage(params);
+        // IPage<ChangeWelfareDTO> page = getPage(params);
+        PageHelper.startPage((Integer) params.get("page"), (Integer) params.get("limit"));
         List<ChangeWelfareDTO> list = baseDao.getWelfareList(params);
-        return new PageData<>(list, page.getTotal());
+        PageInfo<ChangeWelfareDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
     }
 
     @Override
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml
index 6953f24a98..c163416934 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeWelfareDao.xml
@@ -56,13 +56,13 @@
             AND w.GRID_ID = #{gridId}
         </if>
         <if test="name != null and name != ''">
-            AND w.NAME = #{name}
+            AND w.NAME  like concat('%', #{name},'%'）
         </if>
         <if test="idCard != null and idCard != ''">
-            AND w.ID_CARD = #{idCard}
+            AND w.ID_CARD like concat('%', #{idCard},'%')
         </if>
         <if test="mobile != null and mobile != ''">
-            AND w.MOBILE = #{mobile}
+            AND w.MOBILE like concat('%', #{mobile},'%')
         </if>
         <if test="startTime != null and startTime != ''">
             AND w.JOIN_DATE >= #{startTime}