From 19fb5cd76f82af2489801a4518795349ec17357e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Thu, 6 May 2021 13:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=B6=E6=AE=B5=20=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=88=86=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=AD=E5=BF=83=E5=92=8C=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/meapi/controller/WorkCenterController.java     | 8 ++++++--
 .../foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java  | 5 ++---
 .../mesnac/meapi/service/WorkCenterService.java           | 2 +-
 .../mesnac/meapi/service/impl/WorkCenterServiceImpl.java  | 4 ++--
 meapi/src/main/resources/mapper/WorkCenterMapper.xml      | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
index d480c35f..91b6271b 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
@@ -127,12 +127,16 @@ public class WorkCenterController {
         return R.ok(workCenterService.removeByIds(ids));
     }
 
+    /**
+     * 查询工作中心和工作中心描述
+     * @param frontPage
+     * @return
+     */
     @ResponseBody
     @GetMapping("/selectWorkCenter")
     public R getWorkCenterWcList(FrontPage frontPage){
         List<WorkCenter> result;
         String workCenter=frontPage.getGlobalQuery();
-        result = workCenterService.workCenterlist(workCenter);
-        return R.ok(result);
+        return R.ok(workCenterService.workCenterlist(frontPage.getPagePlus(),workCenter));
     }
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java
index 1cd24c7f..3458d210 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java
@@ -1,12 +1,11 @@
 package com.foreverwin.mesnac.meapi.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.meapi.model.WorkCenter;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 /**
  * <p>
  *  Mapper 接口
@@ -17,5 +16,5 @@ import java.util.List;
  */
 @Repository
 public interface WorkCenterMapper extends BaseMapper<WorkCenter> {
-    List<WorkCenter> workCenterlist(@Param("site") String site,@Param("workCenter") String workCenter);
+    IPage workCenterlist(IPage page, @Param("site") String site, @Param("workCenter") String workCenter);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java
index 63511881..9571219a 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java
@@ -26,5 +26,5 @@ public interface WorkCenterService extends IService<WorkCenter> {
 
     List<WorkCenter> selectList(WorkCenter workCenter);
 
-    List<WorkCenter> workCenterlist(String workCenter);
+    IPage workCenterlist(IPage page,String workCenter);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java
index 90a23c74..107ef17a 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java
@@ -44,8 +44,8 @@ public class WorkCenterServiceImpl extends ServiceImpl<WorkCenterMapper, WorkCen
     }
 
     @Override
-    public List<WorkCenter> workCenterlist(String workCenter) {
+    public IPage workCenterlist(IPage page,String workCenter) {
         String site = CommonMethods.getSite();
-        return workCenterMapper.workCenterlist(site, workCenter);
+        return workCenterMapper.workCenterlist(page,site, workCenter);
     }
 }
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/WorkCenterMapper.xml b/meapi/src/main/resources/mapper/WorkCenterMapper.xml
index 87b09ded..3ee6311e 100644
--- a/meapi/src/main/resources/mapper/WorkCenterMapper.xml
+++ b/meapi/src/main/resources/mapper/WorkCenterMapper.xml
@@ -52,8 +52,8 @@
         LEFT JOIN WORK_CENTER_T B ON A.HANDLE=B.WORK_CENTER_BO
         WHERE
           <if test="workCenter != null and workCenter != ''">
-              (A.WORK_CENTER like '%${workCenter}' OR
-              B.DESCRIPTION like '%${workCenter}') AND
+              (A.WORK_CENTER like '%${workCenter}%' OR
+              B.DESCRIPTION like '%${workCenter}%') AND
           </if>
            A.SITE = #{site}
     </select>