From 05df28d78537cf07407ed867bc1b79bfd3750fee Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 四月 2023 10:50:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 6 +++---
src/main/java/com/lf/server/service/show/ApplyService.java | 10 +++++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java
index 8305ed9..26962a1 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -158,6 +158,10 @@
apply.setCount(dr.getDepcodes().size());
apply.setDescr(dr.getDescr());
apply.setCreateUser(ue.getId());
+ apply.setDepcode(dr.getDepcode());
+ apply.setDircodes(dr.getDirs());
+ apply.setGids(StringHelper.join(dr.getIds(), ","));
+ apply.setFilters(dr.getFilter());
return apply;
}
@@ -199,10 +203,10 @@
dr.setEntities(entities);
dr.setWkt(dr.getWkt());
dr.setPwd(pwd);
- dr.setIds(getIds(entity));
- dr.setDirs(entity.getDircodes());
- dr.setFilter(entity.getFilters());
dr.setDepcode(entity.getDepcode());
+ dr.setDirs(entity.getDircodes());
+ dr.setIds(getIds(entity));
+ dr.setFilter(entity.getFilters());
dataLibService.downloadDbReq(ue, dr);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index 934948d..0bdeb1c 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -196,12 +196,12 @@
} else {
dataMap.get(entity).addAll(list);
}
- if ("bborehole".equals(entity)) {
- continue;
- }
if (wrapper.isEmptyOfWhere()) {
wrapper.apply("1 = 1");
}
+ if ("bborehole".equals(entity)) {
+ wrapper.last("limit 100");
+ }
String tab = BaseQueryService.getTabName(baseMapper);
List<AttachEntity> annex = baseMapper.selectAnnex(tab, wrapper);
--
Gitblit v1.9.3