From e31f5210c808586897af580f53d4c2930d22a478 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 14:52:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 ab5fb43..c16bbaf 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -470,7 +470,8 @@
}
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.createZipFile(ue, dre.getEntities(), dre.getWkt(), dre.getPwd());
+ String depcode = null == dre.getDepcodes() || dre.getDepcodes().isEmpty() ? null : dre.getDepcodes().get(0);
+ String guid = dataLibService.createZipFile(ue, dre.getEntities(), depcode, dre.getDirs(), dre.getWkt(), dre.getPwd());
return success(guid);
} catch (Exception ex) {
--
Gitblit v1.9.3