From 314aeb39f049f26d02611d8a426a2322c7ccfac0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 21:11:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
index 46a547b..77246d8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java
@@ -66,6 +66,29 @@
 	}
 
 	/**
+	 * 查询区域菜单树-带层级
+	 * @param parentCode
+	 * @param obj
+	 * @return
+	 */
+	@GetMapping("/selectAttAdBaseTree")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "code", value = "区划编号", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "name", value = "区划名称", paramType = "query", dataType = "string")
+	})
+	@ApiOperation(value = "加载树列表", notes = "传入code")
+	public R selectAttAdBaseTree(String parentCode, @ApiIgnore @RequestParam Map<String, Object> obj) {
+		String code = obj.get("code").toString();
+		if (code.substring(0,4).indexOf("00") > -1) {
+			obj.put("code",code.substring(0,2));
+		} else if (code.substring(0,6).indexOf("00") > -1) {
+			obj.put("code",code.substring(0,4));
+		}
+		// 查询并返回
+		return R.data(attAdBaseService.selectAttAdBaseTree(parentCode, obj));
+	}
+
+	/**
 	 * 懒加载列表 懒加载待优化
 	 */
 	@GetMapping("/lazy-tree")

--
Gitblit v1.9.3