From 0185fb8ca2086e80d54dbfabe399b6af684368d9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Jan 2024 20:25:19 +0800
Subject: [PATCH] 楼盘表新增住户标签

---
 src/main/java/org/springblade/modules/system/controller/RegionController.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/RegionController.java b/src/main/java/org/springblade/modules/system/controller/RegionController.java
index d975204..7d061e0 100644
--- a/src/main/java/org/springblade/modules/system/controller/RegionController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RegionController.java
@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.system.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -113,6 +114,15 @@
 	}
 
 	/**
+	 * 树列表(包含省市县三级)
+	 * @return
+	 */
+	@GetMapping("/getBaseTree")
+	public R getBaseTree() {
+		return R.data(regionService.getBaseTree());
+	}
+
+	/**
 	 * 树列表
 	 * @param parentCode
 	 * @return
@@ -121,6 +131,18 @@
 	@ApiOperation(value = "树列表", notes = "传入menu")
 	public R getTree(String parentCode) {
 		return R.data(regionService.getTree(parentCode));
+	}
+
+
+	/**
+	 * 树列表(获取当前树)
+	 * @param code
+	 * @return
+	 */
+	@GetMapping("/getTownTree")
+	@ApiOperation(value = "树列表", notes = "传入menu")
+	public R getTownTree(String code) {
+		return R.data(regionService.getTownTree(code));
 	}
 
 	/**
@@ -170,8 +192,12 @@
 	@GetMapping("/select")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "下拉数据源", notes = "传入tenant")
-	public R<List<Region>> select(@RequestParam(required = false, defaultValue = "00") String code) {
-		List<Region> list = regionService.list(Wrappers.<Region>query().lambda().eq(Region::getParentCode, code));
+	public R<List<Region>> select(@RequestParam(required = false, defaultValue = "00") String code,Integer level) {
+		LambdaQueryWrapper<Region> wrapper = Wrappers.<Region>query().lambda().eq(Region::getParentCode, code);
+		if (null!=level){
+			wrapper.eq(Region::getRegionLevel,level);
+		}
+		List<Region> list = regionService.list(wrapper);
 		return R.data(list);
 	}
 

--
Gitblit v1.9.3