From c44036e2aadedb6d80168d6f04e3621e4b238b12 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Tue, 24 Dec 2024 16:50:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=B9=BF=E4=B8=9C?=
 =?UTF-8?q?=E7=9C=81=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CommonApiController.java       | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java b/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java
index e89002bc..cd509bdf 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonApiController.java
@@ -1,18 +1,21 @@
 package com.kms.yxgh.common.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kms.common.utils.UserUtils;
 import com.kms.system.domain.SysXzqh;
 import com.kms.system.service.SysDictTypeService;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yxgh.base.Response;
+import com.shuili.common.core.domain.AjaxResult;
+import com.shuili.common.core.domain.entity.SysDept;
 import com.shuili.common.core.domain.entity.SysDictData;
+import com.shuili.common.core.domain.entity.SysUser;
+import com.shuili.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -36,11 +39,33 @@ public class CommonApiController {
 
     @GetMapping("/xzgh/getGuangDong")
     @ApiOperation("获取广东省下属市区")
-    public Response<List<SysXzqh>> getGuangDong() {
-        List<SysXzqh> list = sysXzqhService.list(Wrappers.lambdaQuery(SysXzqh.class)
-                .likeRight(SysXzqh::getXzqhdm, "44")
-                .eq(SysXzqh::getLayer, 2));
-        return Response.ok(list);
+    public Response<List<SysXzqh>> getGuangDong(@RequestParam(value = "xzqhdm", required = false) String xzqhdm) {
+        if (StringUtils.isEmpty(xzqhdm)) {
+            QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
+            queryWrapper.likeRight("XZQHDM", "44")
+                    .eq("LAYER", 5);
+            List<SysXzqh> list = sysXzqhService.list(queryWrapper);
+            return Response.ok(list);
+        } else {
+            SysXzqh xzqh = sysXzqhService.getById(xzqhdm);
+            QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
+            queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
+                    .eq("LAYER", xzqh.getLayer() - 1);
+            List<SysXzqh> list = sysXzqhService.list(queryWrapper);
+            return Response.ok(list);
+        }
+    }
+
+    private String getQuery(String xzqhdm) {
+        int index = xzqhdm.lastIndexOf("000");
+        if (index >= 6) {
+            return getQuery(xzqhdm.substring(0, index));
+        }
+        index = xzqhdm.lastIndexOf("00");
+        if (index >= 0 && index < 6) {
+            return getQuery(xzqhdm.substring(0, index));
+        }
+        return xzqhdm;
     }
 
     @ApiOperation("根据字典类型查询字典数据信息")