From 1991cda18d5675f754e3960b6de95a0089bf7440 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 20 三月 2023 16:02:03 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/sys/ResService.java             |    5 -
 src/main/java/com/lf/server/service/sys/UserService.java            |    8 +-
 src/main/java/com/lf/server/service/show/ApplyService.java          |    4 
 src/main/java/com/lf/server/service/sys/BlacklistService.java       |    4 
 src/main/java/com/lf/server/helper/StringHelper.java                |    6 +-
 src/main/java/com/lf/server/service/data/StyleService.java          |    4 
 src/main/java/com/lf/server/mapper/all/BasicMapper.java             |    2 
 src/main/java/com/lf/server/service/data/DomainService.java         |    5 -
 src/main/java/com/lf/server/service/sys/ReportService.java          |    4 
 src/main/java/com/lf/server/service/data/DictService.java           |    6 +-
 src/main/java/com/lf/server/service/sys/TokenService.java           |    4 
 src/main/java/com/lf/server/service/all/BaseQueryService.java       |   10 +-
 src/main/java/com/lf/server/service/data/DownloadService.java       |    8 +-
 src/main/java/com/lf/server/service/sys/ArgsService.java            |    4 
 src/main/java/com/lf/server/service/data/PublishService.java        |   10 +--
 src/main/java/com/lf/server/service/sys/AttachService.java          |    4 
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |    5 -
 src/main/java/com/lf/server/service/data/MetaService.java           |   18 ++---
 src/main/java/com/lf/server/service/data/VerService.java            |    4 
 src/main/java/com/lf/server/service/sys/DownlogService.java         |    4 
 src/main/java/com/lf/server/service/show/PipelineService.java       |    2 
 src/main/java/com/lf/server/service/sys/LayerService.java           |    4 
 src/main/java/com/lf/server/service/sys/OperateService.java         |    4 
 src/main/java/com/lf/server/service/sys/MsgService.java             |    4 
 src/main/java/com/lf/server/service/sys/ResOpService.java           |    4 
 src/main/java/com/lf/server/service/sys/RoleService.java            |    4 
 data/db_cx.sql                                                      |    4 +
 src/main/java/com/lf/server/service/sys/LoginService.java           |    4 
 src/main/java/com/lf/server/service/data/DirService.java            |    2 
 29 files changed, 72 insertions(+), 79 deletions(-)

diff --git a/data/db_cx.sql b/data/db_cx.sql
index 7d2febd..b1de64d 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -45,8 +45,10 @@
 
 select * from bs.s_explorationpoint
 select * from lf.sys_attach where tab = 'bs.s_explorationpoint' and tab_guid in (select eventid from bs.s_explorationpoint where exppointid = '001')
+select * from lf.sys_token order by id limit 10
 
-
+select * from lf.sys_meta where name like '%shp%'
+delete from lf.sys_meta where guid in ('20e9c84639279604e9539f8003a49747','44bb08c1a69b7ba2b3a8096e22d067f3','d1da4cc853172da980dd36e9d8e26b24')
 
 
 
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index f0c8be9..65d5dfc 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -310,11 +310,8 @@
             if (StringHelper.isEmpty(field) || StringHelper.isSqlInjection(field)) {
                 return fail("鏌ヨ瀛楁涓嶆纭�", null);
             }
-            if (!StringHelper.isEmpty(value)) {
-                value = value.trim().replace("'", "");
-            }
 
-            value = StringHelper.getLikeStr2(value);
+            value = StringHelper.isEmpty(value) ? "%" : StringHelper.getLikeUpperStr(value);
             List<String> rs = baseMapper.selectFieldFuzzy(tab, field, value);
 
             return success(rs);
diff --git a/src/main/java/com/lf/server/helper/StringHelper.java b/src/main/java/com/lf/server/helper/StringHelper.java
index f1647e7..d9e83ba 100644
--- a/src/main/java/com/lf/server/helper/StringHelper.java
+++ b/src/main/java/com/lf/server/helper/StringHelper.java
@@ -123,10 +123,10 @@
     }
 
     /**
-     * 鑾峰彇 like 瀛楃涓�-2
+     * 鑾峰彇 like 瀛楃涓�
      */
-    public static String getLikeStr2(String str) {
-        return StringHelper.isEmpty(str) ? "%" : "%" + str.trim() + "%";
+    public static String getLikeUpperStr(String str) {
+        return StringHelper.isEmpty(str) ? null : "%" + str.trim().toUpperCase() + "%";
     }
 
     /**
diff --git a/src/main/java/com/lf/server/mapper/all/BasicMapper.java b/src/main/java/com/lf/server/mapper/all/BasicMapper.java
index 93c9dac..61ac03c 100644
--- a/src/main/java/com/lf/server/mapper/all/BasicMapper.java
+++ b/src/main/java/com/lf/server/mapper/all/BasicMapper.java
@@ -20,7 +20,7 @@
      * @param value 鍊�
      * @return 缁撴灉鍒楄〃
      */
-    @Select("select ${field} from ${tab} where ${field} like #{value} order by ${field} limit 10")
+    @Select("select ${field} from ${tab} where upper(${field}) like #{value} order by ${field} limit 10")
     public List<String> selectFieldFuzzy(@Param("tab") String tab, @Param("field") String field, @Param("value") String value);
 
     /**
diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index 89a4217..2be2e96 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -229,28 +229,28 @@
 
     @Override
     public List<IdNameEntity> selectUserFuzzy(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return baseQueryMapper.selectUserFuzzy(name);
     }
 
     @Override
     public List<IdNameEntity> selectDepFuzzy(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return baseQueryMapper.selectDepFuzzy(name);
     }
 
     @Override
     public Integer selectTabsForCount(String tab, String field) {
-        tab = StringHelper.getLikeStr(tab);
+        tab = StringHelper.getLikeUpperStr(tab);
 
         return baseQueryMapper.selectTabsForCount(tab, field);
     }
 
     @Override
     public List<TabEntity> selectTabsByPage(String tab, String field, String filters, Integer limit, Integer offset) {
-        tab = StringHelper.getLikeStr(tab);
+        tab = StringHelper.getLikeUpperStr(tab);
 
         return baseQueryMapper.selectTabsByPage(tab, field, filters, limit, offset);
     }
@@ -277,7 +277,7 @@
 
     @Override
     public List<KeyValueEntity> selectDirTypes(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return baseQueryMapper.selectDirTypes(name);
     }
diff --git a/src/main/java/com/lf/server/service/data/DictService.java b/src/main/java/com/lf/server/service/data/DictService.java
index 9a5b8cf..c70753f 100644
--- a/src/main/java/com/lf/server/service/data/DictService.java
+++ b/src/main/java/com/lf/server/service/data/DictService.java
@@ -21,7 +21,7 @@
     @Override
     public Integer selectCount(String ns, String tab) {
         ns = StringHelper.isNull(ns) ? null : ns.trim();
-        tab = StringHelper.getLikeStr(tab);
+        tab = StringHelper.getLikeUpperStr(tab);
 
         return dictMapper.selectCount(ns, tab);
     }
@@ -29,7 +29,7 @@
     @Override
     public List<DictEntity> selectByPage(String ns, String tab, Integer limit, Integer offset) {
         ns = StringHelper.isNull(ns) ? null : ns.trim();
-        tab = StringHelper.getLikeStr(tab);
+        tab = StringHelper.getLikeUpperStr(tab);
 
         return dictMapper.selectByPage(ns, tab, limit, offset);
     }
@@ -41,7 +41,7 @@
 
     @Override
     public List<TabEntity> selectDictTab(String name, String field) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return dictMapper.selectDictTab(name, field);
     }
diff --git a/src/main/java/com/lf/server/service/data/DirService.java b/src/main/java/com/lf/server/service/data/DirService.java
index a8f5cfa..2ff7021 100644
--- a/src/main/java/com/lf/server/service/data/DirService.java
+++ b/src/main/java/com/lf/server/service/data/DirService.java
@@ -71,7 +71,7 @@
 
     @Override
     public List<DirEntity> selectProject(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return dirMapper.selectProject(name);
     }
diff --git a/src/main/java/com/lf/server/service/data/DomainService.java b/src/main/java/com/lf/server/service/data/DomainService.java
index 8386fbc..b111576 100644
--- a/src/main/java/com/lf/server/service/data/DomainService.java
+++ b/src/main/java/com/lf/server/service/data/DomainService.java
@@ -1,6 +1,5 @@
 package com.lf.server.service.data;
 
-import com.lf.server.entity.ctrl.TabEntity;
 import com.lf.server.entity.data.DomainEntity;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.mapper.data.DomainMapper;
@@ -20,14 +19,14 @@
 
     @Override
     public Integer selectCount(String ns, String tab, String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return domainMapper.selectCount(ns, tab, name);
     }
 
     @Override
     public List<DomainEntity> selectByPage(String ns, String tab, String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return domainMapper.selectByPage(ns, tab, name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/data/DownloadService.java b/src/main/java/com/lf/server/service/data/DownloadService.java
index 6d35529..b5525bb 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -42,28 +42,28 @@
 
     @Override
     public Integer selectCount(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return downloadMapper.selectCount(name);
     }
 
     @Override
     public List<DownloadEntity> selectByPage(String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return downloadMapper.selectByPage(name, limit, offset);
     }
 
     @Override
     public Integer selectCountForUser(Integer createUser, Integer type, String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return downloadMapper.selectCountForUser(createUser, type, name);
     }
 
     @Override
     public List<DownloadEntity> selectByPageForUser(Integer createUser, Integer type, String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return downloadMapper.selectByPageForUser(createUser, type, name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java
index 1274a36..c3193ec 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -2,12 +2,10 @@
 
 import com.lf.server.entity.all.StaticData;
 import com.lf.server.entity.data.MetaEntity;
-import com.lf.server.entity.sys.AttachEntity;
 import com.lf.server.helper.PathHelper;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.helper.WebHelper;
 import com.lf.server.mapper.data.MetaMapper;
-import com.lf.server.service.all.UploadAttachService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +34,7 @@
     public Integer selectCount(String depcode, String dircode, Integer verid, String name) {
         depcode = StringHelper.getRightLike(depcode);
         dircode = StringHelper.getRightLike(dircode);
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return metaMapper.selectCount(depcode, dircode, verid, name);
     }
@@ -45,7 +43,7 @@
     public List<MetaEntity> selectByPage(String depcode, String dircode, Integer verid, String name, Integer limit, Integer offset) {
         depcode = StringHelper.getRightLike(depcode);
         dircode = StringHelper.getRightLike(dircode);
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return metaMapper.selectByPage(depcode, dircode, verid, name, limit, offset);
     }
@@ -53,7 +51,7 @@
     @Override
     public Integer selectMetasForCount(String depcode, String dirs, String name) {
         depcode = StringHelper.getRightLike(depcode);
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return metaMapper.selectMetasForCount(depcode, dirs, name);
     }
@@ -61,35 +59,35 @@
     @Override
     public List<MetaEntity> selectMetasForPage(String depcode, String dirs, String name, Integer limit, Integer offset) {
         depcode = StringHelper.getRightLike(depcode);
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return metaMapper.selectMetasForPage(depcode, dirs, name, limit, offset);
     }
 
     @Override
     public Integer selectCountForUpload(String name, Integer createUser, String types) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return metaMapper.selectCountForUpload(name, createUser, types);
     }
 
     @Override
     public List<MetaEntity> selectByPageForUpload(String name, Integer createUser, String types, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return metaMapper.selectByPageForUpload(name, createUser, types, limit, offset);
     }
 
     @Override
     public Integer selectCountByPid(Integer metaid, String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return metaMapper.selectCountByPid(metaid, name);
     }
 
     @Override
     public List<MetaEntity> selectPageByPid(Integer metaid, String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return metaMapper.selectPageByPid(metaid, name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/data/PublishService.java b/src/main/java/com/lf/server/service/data/PublishService.java
index 3091c26..673b5f8 100644
--- a/src/main/java/com/lf/server/service/data/PublishService.java
+++ b/src/main/java/com/lf/server/service/data/PublishService.java
@@ -6,7 +6,6 @@
 import com.lf.server.entity.ctrl.PubEntity;
 import com.lf.server.entity.data.MetaEntity;
 import com.lf.server.entity.data.PublishEntity;
-import com.lf.server.entity.show.ExportEntity;
 import com.lf.server.helper.RestHelper;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.mapper.data.PublishMapper;
@@ -15,7 +14,6 @@
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.List;
@@ -35,14 +33,14 @@
 
     @Override
     public Integer selectCount(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return publishMapper.selectCount(name);
     }
 
     @Override
     public List<PublishEntity> selectByPage(String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return publishMapper.selectByPage(name, limit, offset);
     }
@@ -91,7 +89,7 @@
     public Integer selectMetasByCount(String depcode, String dircode, Integer verid, String types, String name) {
         depcode = StringHelper.getRightLike(depcode);
         dircode = StringHelper.getRightLike(dircode);
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return publishMapper.selectMetasByCount(depcode, dircode, verid, types, name);
     }
@@ -100,7 +98,7 @@
     public List<MetaEntity> selectMetasByPage(String depcode, String dircode, Integer verid, String types, String name, Integer limit, Integer offset) {
         depcode = StringHelper.getRightLike(depcode);
         dircode = StringHelper.getRightLike(dircode);
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return publishMapper.selectMetasByPage(depcode, dircode, verid, types, name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/data/StyleService.java b/src/main/java/com/lf/server/service/data/StyleService.java
index 35d7423..c512561 100644
--- a/src/main/java/com/lf/server/service/data/StyleService.java
+++ b/src/main/java/com/lf/server/service/data/StyleService.java
@@ -20,14 +20,14 @@
 
     @Override
     public Integer selectCount(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return styleMapper.selectCount(name);
     }
 
     @Override
     public List<StyleEntity> selectByPage(String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return styleMapper.selectByPage(name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/data/VerService.java b/src/main/java/com/lf/server/service/data/VerService.java
index 0bf3a24..ec6e982 100644
--- a/src/main/java/com/lf/server/service/data/VerService.java
+++ b/src/main/java/com/lf/server/service/data/VerService.java
@@ -20,14 +20,14 @@
 
     @Override
     public Integer selectCount(Integer dirid, String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return verMapper.selectCount(dirid, name);
     }
 
     @Override
     public List<VerEntity> selectByPage(Integer dirid, String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return verMapper.selectByPage(dirid, name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java
index 534e0b6..286f645 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -36,14 +36,14 @@
 
     @Override
     public Integer selectCount(String uname, Integer status, Timestamp start, Timestamp end) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return applyMapper.selectCount(uname, status, start, end);
     }
 
     @Override
     public List<ApplyEntity> selectByPage(Integer userid, String uname, Integer status, Timestamp start, Timestamp end, Integer limit, Integer offset) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return applyMapper.selectByPage(userid, uname, status, start, end, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/show/PipelineService.java b/src/main/java/com/lf/server/service/show/PipelineService.java
index aee0704..3adfbde 100644
--- a/src/main/java/com/lf/server/service/show/PipelineService.java
+++ b/src/main/java/com/lf/server/service/show/PipelineService.java
@@ -42,7 +42,7 @@
 
     @Override
     public List<PipelineEntity> selectPipelines(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return pipelineMapper.selectPipelines(name);
     }
diff --git a/src/main/java/com/lf/server/service/sys/ArgsService.java b/src/main/java/com/lf/server/service/sys/ArgsService.java
index 8e3575c..2fc0c19 100644
--- a/src/main/java/com/lf/server/service/sys/ArgsService.java
+++ b/src/main/java/com/lf/server/service/sys/ArgsService.java
@@ -21,14 +21,14 @@
 
     @Override
     public Integer selectCount(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return argsMapper.selectCount(name);
     }
 
     @Override
     public List<ArgsEntity> selectByPage(String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return argsMapper.selectByPage(name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/AttachService.java b/src/main/java/com/lf/server/service/sys/AttachService.java
index 3387605..5d08250 100644
--- a/src/main/java/com/lf/server/service/sys/AttachService.java
+++ b/src/main/java/com/lf/server/service/sys/AttachService.java
@@ -19,14 +19,14 @@
 
     @Override
     public Integer selectCount(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return attachMapper.selectCount(name);
     }
 
     @Override
     public List<AttachEntity> selectByPage(String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return attachMapper.selectByPage(name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/BlacklistService.java b/src/main/java/com/lf/server/service/sys/BlacklistService.java
index f2fdcc2..8beb0f2 100644
--- a/src/main/java/com/lf/server/service/sys/BlacklistService.java
+++ b/src/main/java/com/lf/server/service/sys/BlacklistService.java
@@ -28,14 +28,14 @@
 
     @Override
     public Integer selectCount(String ip, Integer type) {
-        ip = StringHelper.getLikeStr(ip);
+        ip = StringHelper.getLikeUpperStr(ip);
 
         return blacklistMapper.selectCount(ip, type);
     }
 
     @Override
     public List<BlacklistEntity> selectByPage(String ip, Integer type, Integer limit, Integer offset) {
-        ip = StringHelper.getLikeStr(ip);
+        ip = StringHelper.getLikeUpperStr(ip);
 
         return blacklistMapper.selectByPage(ip, type, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/DownlogService.java b/src/main/java/com/lf/server/service/sys/DownlogService.java
index d131b71..2814ee8 100644
--- a/src/main/java/com/lf/server/service/sys/DownlogService.java
+++ b/src/main/java/com/lf/server/service/sys/DownlogService.java
@@ -28,14 +28,14 @@
 
     @Override
     public Integer selectCount(String uname, Integer type, Timestamp start, Timestamp end) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return downlogMapper.selectCount(uname, type, start, end);
     }
 
     @Override
     public List<DownlogEntity> selectByPage(String uname, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return downlogMapper.selectByPage(uname, type, start, end, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/LayerService.java b/src/main/java/com/lf/server/service/sys/LayerService.java
index 1389361..a950244 100644
--- a/src/main/java/com/lf/server/service/sys/LayerService.java
+++ b/src/main/java/com/lf/server/service/sys/LayerService.java
@@ -19,14 +19,14 @@
 
     @Override
     public Integer selectCount(String cnName) {
-        cnName = StringHelper.getLikeStr(cnName);
+        cnName = StringHelper.getLikeUpperStr(cnName);
 
         return layerMapper.selectCount(cnName);
     }
 
     @Override
     public List<LayerEntity> selectByPage(String cnName, Integer limit, Integer offset) {
-        cnName = StringHelper.getLikeStr(cnName);
+        cnName = StringHelper.getLikeUpperStr(cnName);
 
         return layerMapper.selectByPage(cnName, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/LoginService.java b/src/main/java/com/lf/server/service/sys/LoginService.java
index 666868f..5e9653a 100644
--- a/src/main/java/com/lf/server/service/sys/LoginService.java
+++ b/src/main/java/com/lf/server/service/sys/LoginService.java
@@ -23,14 +23,14 @@
 
     @Override
     public Integer selectCount(String uname, Integer type, Timestamp start, Timestamp end) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return loginMapper.selectCount(uname, type, start, end);
     }
 
     @Override
     public List<LoginEntity> selectByPage(String uname, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return loginMapper.selectByPage(uname, type, start, end, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/MsgService.java b/src/main/java/com/lf/server/service/sys/MsgService.java
index 2dd537e..19c7d87 100644
--- a/src/main/java/com/lf/server/service/sys/MsgService.java
+++ b/src/main/java/com/lf/server/service/sys/MsgService.java
@@ -19,14 +19,14 @@
 
     @Override
     public Integer selectCount(String title) {
-        title = StringHelper.getLikeStr(title);
+        title = StringHelper.getLikeUpperStr(title);
 
         return msgMapper.selectCount(title);
     }
 
     @Override
     public List<MsgEntity> selectByPage(String title, Integer limit, Integer offset) {
-        title = StringHelper.getLikeStr(title);
+        title = StringHelper.getLikeUpperStr(title);
 
         return msgMapper.selectByPage(title, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/OperateService.java b/src/main/java/com/lf/server/service/sys/OperateService.java
index b2a2e74..aa833b4 100644
--- a/src/main/java/com/lf/server/service/sys/OperateService.java
+++ b/src/main/java/com/lf/server/service/sys/OperateService.java
@@ -21,14 +21,14 @@
 
     @Override
     public Integer selectCount(String uname, Integer type, Timestamp start, Timestamp end) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return operateMapper.selectCount(uname, type, start, end);
     }
 
     @Override
     public List<OperateEntity> selectByPage(String uname, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return operateMapper.selectByPage(uname, type, start, end, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/ReportService.java b/src/main/java/com/lf/server/service/sys/ReportService.java
index 8e0bfaa..88fff0d 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -36,14 +36,14 @@
 
     @Override
     public Integer selectCount(String name, String code) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return reportMapper.selectCount(name, code);
     }
 
     @Override
     public List<ReportEntity> selectByPage(String name, String code, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return reportMapper.selectByPage(name, code, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/ResOpService.java b/src/main/java/com/lf/server/service/sys/ResOpService.java
index a55a184..733ceb9 100644
--- a/src/main/java/com/lf/server/service/sys/ResOpService.java
+++ b/src/main/java/com/lf/server/service/sys/ResOpService.java
@@ -21,14 +21,14 @@
 
     @Override
     public Integer selectCount(String name, Integer type, Timestamp start, Timestamp end) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return resOpMapper.selectCount(name, type, start, end);
     }
 
     @Override
     public List<ResOpEntity> selectByPage(String name, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return resOpMapper.selectByPage(name, type, start, end, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/ResService.java b/src/main/java/com/lf/server/service/sys/ResService.java
index 2a75a1a..d31c0ea 100644
--- a/src/main/java/com/lf/server/service/sys/ResService.java
+++ b/src/main/java/com/lf/server/service/sys/ResService.java
@@ -1,6 +1,5 @@
 package com.lf.server.service.sys;
 
-import com.lf.server.entity.sys.LoginEntity;
 import com.lf.server.entity.sys.ResEntity;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.mapper.sys.ResMapper;
@@ -21,14 +20,14 @@
 
     @Override
     public Integer selectCount(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return resMapper.selectCount(name);
     }
 
     @Override
     public List<ResEntity> selectByPage(String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return resMapper.selectByPage(name, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/RoleService.java b/src/main/java/com/lf/server/service/sys/RoleService.java
index bf6047b..680c2de 100644
--- a/src/main/java/com/lf/server/service/sys/RoleService.java
+++ b/src/main/java/com/lf/server/service/sys/RoleService.java
@@ -20,14 +20,14 @@
 
     @Override
     public Integer selectCount(String name, Integer depid) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return roleMapper.selectCount(name, depid);
     }
 
     @Override
     public List<RoleEntity> selectByPage(String name, Integer depid, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return roleMapper.selectByPage(name, depid, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/TokenService.java b/src/main/java/com/lf/server/service/sys/TokenService.java
index 2763157..5203629 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -40,14 +40,14 @@
 
     @Override
     public Integer selectCount(String name, Integer type) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return tokenMapper.selectCount(name, type);
     }
 
     @Override
     public List<TokenEntity> selectByPage(String name, Integer type, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return tokenMapper.selectByPage(name, type, limit, offset);
     }
diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
index 46f4df2..2301bee 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -38,7 +38,7 @@
 
     @Override
     public Integer selectCount(String uname, String depcode) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
         depcode = StringHelper.getRightLike(depcode);
 
         return userMapper.selectCount(uname, depcode);
@@ -61,7 +61,7 @@
 
     @Override
     public List<UserEntity> selectByPage(String uname, String depcode, Integer limit, Integer offset) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
         depcode = StringHelper.getRightLike(depcode);
 
         return userMapper.selectByPage(uname, depcode, limit, offset);
@@ -119,7 +119,7 @@
 
     @Override
     public Integer selectCountForRole(String uname, Integer roleid, String depcode) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
         depcode = StringHelper.getRightLike(depcode);
 
         return userMapper.selectCountForRole(uname, roleid, depcode);
@@ -127,7 +127,7 @@
 
     @Override
     public List<UserEntity> selectByPageForRole(String uname, Integer roleid, String depcode, Integer limit, Integer offset) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
         depcode = StringHelper.getRightLike(depcode);
 
         return userMapper.selectByPageForRole(uname, roleid, depcode, limit, offset);

--
Gitblit v1.9.3