From 80e15fea89e48b93626c5b5464b156dc580167b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 17 二月 2023 14:54:32 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

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 6e9e6cc..5271686 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -249,22 +249,21 @@
                 return fail("鍗曚綅浠g爜鍚湁闈炴硶瀛楃", null);
             }
 
-            String filter = "1=1";
+            String filters = "1=1";
             if (!StringHelper.isEmpty(depcode)) {
-                filter += String.format(" and depid like '%s%%'", depcode);
+                filters += String.format(" and depid like '%s%%'", depcode);
             }
-            dirs = DataLibService.copeCodes(dirs, "dircode");
+            dirs = DataLibService.copeCodes(dirs, "dirid");
             if (dirs != null) {
-                filter += String.format(" and (%s)", dirs);
+                filters += String.format(" and (%s)", dirs);
             }
-            filter = filter.replace("1=1 and ", "");
 
-            int count = baseQueryService.selectTabsForCount(tab, filter);
+            int count = baseQueryService.selectTabsForCount(tab);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, filter, pageSize, pageSize * (pageIndex - 1));
+            List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, filters, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {

--
Gitblit v1.9.3