From 5213bb81eff07268fe07bcd52a1c0ef98daeab98 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Thu, 12 Aug 2021 11:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meapi/controller/ResrceController.java    | 19 +++++++------------
 .../main/resources/mapper/ResrceMapper.xml    |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
index abc1cc9d..5ac59e01 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
@@ -1,19 +1,16 @@
 package com.foreverwin.mesnac.meapi.controller;
 
-import com.foreverwin.mesnac.meapi.util.StringUtils;
-import com.foreverwin.modular.core.util.R;
-import com.foreverwin.modular.core.util.FrontPage;
-import com.foreverwin.modular.core.util.CommonMethods;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.foreverwin.mesnac.meapi.model.Resrce;
+import com.foreverwin.mesnac.meapi.service.ResrceService;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.foreverwin.mesnac.meapi.service.ResrceService;
-import com.foreverwin.mesnac.meapi.model.Resrce;
-
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -98,9 +95,7 @@ public class ResrceController {
             queryWrapper.setEntity(resrce);
             if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
                 queryWrapper
-                        .like(Resrce.HANDLE, frontPage.getGlobalQuery())
-                        .or().like(Resrce.SITE, frontPage.getGlobalQuery())
-                        .or().like(Resrce.RESRCE, frontPage.getGlobalQuery())
+                        .like(Resrce.RESRCE, frontPage.getGlobalQuery())
                         .or().like(Resrce.DESCRIPTION, frontPage.getGlobalQuery())
                         .or().like(Resrce.STATUS_BO, frontPage.getGlobalQuery())
                         .or().like(Resrce.PROCESS_RESOURCE, frontPage.getGlobalQuery())
diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml
index 4bb9b417..beea997e 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -284,7 +284,7 @@
             </if>
         </where>
         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
-            AND ${ew.sqlSegment}
+              ${ew.sqlSegment}
         </if>
     </select>