From fc942f8fce38daf4f1641c0f105fdc3117b5485f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 19 六月 2023 17:17:08 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 9106d9b..bedbf9b 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -28,6 +28,7 @@
 import com.lf.server.service.show.DataLibService;
 import com.lf.server.service.sys.AttachService;
 import com.lf.server.service.sys.DepService;
+import com.lf.server.service.sys.DownlogService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -64,7 +65,10 @@
     DataLibService dataLibService;
 
     @Autowired
-    DownloadService downloadService;
+    public DownlogService downlogService;
+
+    @Autowired
+    public DownloadService downloadService;
 
     @Autowired
     BaseQueryService baseQueryService;
@@ -196,7 +200,7 @@
             if (StringHelper.isEmpty(wkt)) {
                 return fail("WKT涓嶈兘涓虹┖", null);
             }
-            if (null == limit || limit < 1 || limit > StaticData.ONE_HUNDRED) {
+            if (null == limit || limit < 1 || limit > StaticData.I100) {
                 limit = 20;
             }
             if (null == buffer || buffer < 0 || buffer > StaticData.ONE_HUNDRED_THOUSAND) {
@@ -710,11 +714,11 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            int count = downloadService.selectCountForUser(ue.getId(), 4, name);
+            int count = downloadService.selectCountForUser(ue.getId(), "3,4", name);
             if (count == 0) {
                 return success(0, null);
             }
-            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 4, name, pageSize, pageSize * (pageIndex - 1));
+            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "3,4", name, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {

--
Gitblit v1.9.3