From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/controller/show/ExportController.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/ExportController.java b/src/main/java/com/lf/server/controller/show/ExportController.java
index 4515934..77e0046 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -63,15 +63,15 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            int count = downloadService.selectCountForUser(ue.getCreateUser(), 2, name);
+            int count = downloadService.selectCountForUser(ue.getId(), "2", name);
             if (count == 0) {
                 return success(0, null);
             }
-            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 2, name, pageSize, pageSize * (pageIndex - 1));
+            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "2", name, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -85,10 +85,7 @@
     public ResponseMsg<String> insertMap(@RequestBody ExportEntity entity, HttpServletRequest req) {
         try {
             boolean flag = entity.getXmin() == 0 && entity.getYmin() == 0 && entity.getXmax() == 0 && entity.getYmax() == 0;
-            if (entity == null ||
-                    StringHelper.isEmpty(entity.getLayers()) ||
-                    StringHelper.isEmpty(entity.getToken()) ||
-                    flag) {
+            if (StringHelper.isEmpty(entity.getLayers()) || StringHelper.isEmpty(entity.getToken()) || flag) {
                 return fail("鍙傛暟涓嶅畬鏁�");
             }
 
@@ -104,7 +101,7 @@
 
             return success("鍑哄浘鎴愬姛", str);
         } catch (Exception ex) {
-            return fail(ex.getMessage());
+            return fail(ex, null);
         }
     }
 

--
Gitblit v1.9.3