From 2b834d912610a275806c91756c80cbde99c3ce33 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 09 May 2023 14:48:22 +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, 17 insertions(+), 6 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 d78a170..46a547b 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
@@ -48,6 +48,23 @@
 		return R.data(pageList);
 	}
 
+	@GetMapping("/select")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "code", value = "区划编号", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "name", value = "区划名称", paramType = "query", dataType = "string")
+	})
+	@ApiOperation(value = "加载树列表", notes = "传入code")
+	public R<List<AttAdBaseVO>> select(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));
+		}
+		List<AttAdBaseVO> list = attAdBaseService.lazyTree(parentCode, obj);
+		return R.data(listNodeLazyVO(list));
+	}
+
 	/**
 	 * 懒加载列表 懒加载待优化
 	 */
@@ -58,12 +75,6 @@
 	})
 	@ApiOperation(value = "懒加载列表", notes = "传入code")
 	public R<List<AttAdBaseVO>> lazyTree(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));
-		}
 		List<AttAdBaseVO> list = attAdBaseService.lazyTree(parentCode, obj);
 		return R.data(listNodeLazyVO(list));
 	}

--
Gitblit v1.9.3