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/service/show/LocateService.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/LocateService.java b/src/main/java/com/lf/server/service/show/LocateService.java
index c11f74a..dbf7672 100644
--- a/src/main/java/com/lf/server/service/show/LocateService.java
+++ b/src/main/java/com/lf/server/service/show/LocateService.java
@@ -3,9 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lf.server.entity.bd.DlgAgnpEntity;
+import com.lf.server.entity.bd.DlgagnpEntity;
import com.lf.server.helper.StringHelper;
-import com.lf.server.mapper.bd.DlgAgnpMapper;
+import com.lf.server.mapper.bd.DlgagnpMapper;
+import com.lf.server.service.all.BaseQueryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,13 +17,16 @@
@Service
public class LocateService {
@Autowired
- DlgAgnpMapper dlgAgnpMapper;
+ DlgagnpMapper dlgAgnpMapper;
- public Page<DlgAgnpEntity> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
- Page<DlgAgnpEntity> paging = new Page<>(pageIndex, pageSize);
- paging.addOrder(OrderItem.asc("gid"));
+ @Autowired
+ BaseQueryService baseQueryService;
- QueryWrapper<DlgAgnpEntity> wrapper = null;
+ public Page<DlgagnpEntity> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ Page<DlgagnpEntity> paging = new Page<>(pageIndex, pageSize);
+ paging.addOrder(OrderItem.desc("gid"));
+
+ QueryWrapper<DlgagnpEntity> wrapper = null;
if (!StringHelper.isEmpty(name)) {
wrapper = new QueryWrapper<>();
wrapper.like("name", name.trim());
@@ -32,6 +36,11 @@
}
public String selectWktById(Integer id) {
- return dlgAgnpMapper.selectWktById(id);
+ String tab = BaseQueryService.getTabName(dlgAgnpMapper);
+ if (StringHelper.isNull(tab)) {
+ return null;
+ }
+
+ return dlgAgnpMapper.selectWktById(tab, id);
}
}
--
Gitblit v1.9.3