From c761b4e1ac45748da482fbfd99a9ffb4e940f781 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 17 二月 2023 16:01:41 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   12 +++++++++++-
 1 files changed, 11 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 5271686..7b830b5 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -91,6 +91,8 @@
     @ApiOperation(value = "鍒嗛〉鏌ヨ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
+            @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+            @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
             @ApiImplicitParam(name = "filter", value = "杩囨护鏉′欢", dataType = "String", paramType = "query", example = "gid >= 50 and name like '鍘�' and objectid < 5000.0"),
             @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = ""),
             //@ApiImplicitParam(name = "srid", value = "绌洪棿寮曠敤鏍囪瘑绗�", dataType = "Integer", paramType = "query", example = "4326"),
@@ -99,7 +101,7 @@
     })
     @GetMapping(value = "/selectByPage")
     @PostMapping(value = "/selectByPage")
-    public ResponseMsg<List<Object>> selectByPage(String name, String filter, String wkt, Integer pageIndex, Integer pageSize) {
+    public ResponseMsg<List<Object>> selectByPage(String name, String depcode, String dirs, String filter, String wkt, Integer pageIndex, Integer pageSize) {
         try {
             BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
             if (baseMapper == null) {
@@ -109,6 +111,14 @@
             QueryWrapper wrapper = new QueryWrapper();
             baseQueryService.addFilterWrapper(wrapper, filter);
             baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt);
+            if (!StringHelper.isEmpty(depcode)) {
+                wrapper.likeRight("depid", depcode);
+            }
+
+            dirs = DataLibService.copeCodes(dirs, "dirid");
+            if (!StringHelper.isEmpty(dirs)) {
+                wrapper.apply(dirs);
+            }
 
             Page<Object> page = new Page<>(pageIndex, pageSize);
             page.addOrder(OrderItem.asc("gid"));

--
Gitblit v1.9.3