From 3dd9fbdde1486a79179bc43d9ab4cd4381848842 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 03 Jul 2024 17:42:29 +0800
Subject: [PATCH] 行政区划优化

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 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 687816b..ee2ddd3 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
@@ -84,14 +84,14 @@
 	})
 	@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));
-		}else if (code.substring(0,8).indexOf("00") > -1){
-			obj.put("code",code.substring(0,8));
-		}
+//		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));
+//		}else if (code.substring(0,8).indexOf("00") > -1){
+//			obj.put("code",code.substring(0,8));
+//		}
 		List<AttAdBaseVO> list = attAdBaseService.lazyTree(parentCode, obj);
 		return R.data(listNodeLazyVO(list));
 	}
@@ -130,12 +130,12 @@
 	})
 	@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));
-		}
+//		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));
 	}
@@ -158,4 +158,11 @@
 		return ForestNodeMerger.merge(list);
 	}
 
+
+	@GetMapping("/getYwxtAttadBaseList")
+	public R getYwxtAttadBaseList(String parentId,String isYwxtRegion){
+		List<AttAdBase> attAdBases = attAdBaseService.getYwxtAttadBaseList(parentId,isYwxtRegion);
+		return R.data(attAdBases);
+	}
+
 }

--
Gitblit v1.9.3