From 64d3e9657fb45b6415b19e23f483d46a82efe939 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 三月 2023 13:56:42 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/all/BaseQueryService.java |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

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 c138848..286df38 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -7,7 +7,6 @@
 import com.lf.server.entity.ctrl.KeyValueEntity;
 import com.lf.server.entity.ctrl.TabEntity;
 import com.lf.server.entity.data.DictEntity;
-import com.lf.server.entity.data.DirEntity;
 import com.lf.server.entity.data.DomainEntity;
 import com.lf.server.helper.AesHelper;
 import com.lf.server.helper.ClassHelper;
@@ -104,7 +103,7 @@
 
         switch (express) {
             case "like":
-                wrapper.like(field, val);
+                wrapper.like("UPPER(" + field + ")", val.toString().toUpperCase());
                 break;
             case ">":
                 wrapper.gt(field, val);
@@ -224,22 +223,17 @@
     }
 
     @Override
-    public List<TabEntity> selectTabs() {
-        return baseQueryMapper.selectTabs();
+    public Integer selectTabsForCount(String tab, String field) {
+        tab = StringHelper.getLikeStr(tab);
+
+        return baseQueryMapper.selectTabsForCount(tab, field);
     }
 
     @Override
-    public Integer selectTabsForCount(String tab) {
+    public List<TabEntity> selectTabsByPage(String tab, String field, String filters, Integer limit, Integer offset) {
         tab = StringHelper.getLikeStr(tab);
 
-        return baseQueryMapper.selectTabsForCount(tab);
-    }
-
-    @Override
-    public List<TabEntity> selectTabsByPage(String tab, Integer limit, Integer offset) {
-        tab = StringHelper.getLikeStr(tab);
-
-        return baseQueryMapper.selectTabsByPage(tab, limit, offset);
+        return baseQueryMapper.selectTabsByPage(tab, field, filters, limit, offset);
     }
 
     @Override
@@ -263,7 +257,9 @@
     }
 
     @Override
-    public List<DirEntity> selectBaseType() {
-        return baseQueryMapper.selectBaseType();
+    public List<KeyValueEntity> selectDirTypes(String name) {
+        name = StringHelper.getLikeStr(name);
+
+        return baseQueryMapper.selectDirTypes(name);
     }
 }

--
Gitblit v1.9.3