1

13693261870

2023-04-03 05b7f36c1fdb1dae4fd2131f63e10f72f85ee42c

 src/main/java/com/lf/server/service/show/DataLibService.java

@@ -128,7 +128,7 @@
        }

        for (String id : ids) {
            if (StringHelper.isEmpty(id)) {
            if (StringHelper.isEmpty(id) || "00".equals(id)) {
                continue;
            }
            if (!rs.contains(id)) {
@@ -184,34 +184,7 @@
                }

                QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
                List list = baseMapper.selectList(wrapper);
                if (null == list || list.size() == 0) {
                    continue;
                }

                if (!dataMap.containsKey(entity)) {
                    dataMap.put(entity, list);
                } else {
                    dataMap.get(entity).addAll(list);
                }
                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);
                if (null == annex || annex.isEmpty()) {
                    continue;
                }

                if (!annexMap.containsKey(entity)) {
                    annexMap.put(tab.replace(".", "_"), annex);
                } else {
                    annexMap.get(tab.replace(".", "_")).addAll(annex);
                }
                downloadService.addData(entity, baseMapper, wrapper, dataMap, annexMap);
            } catch (Exception ex) {
                log.error(ex.getMessage(), ex);
            }