From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 1820d00..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,12 +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));
- }
+// 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));
}
@@ -107,6 +109,8 @@
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,6));
}
}
List<AttAdBaseVO> list = attAdBaseService.lazyTreeAll(parentCode, obj);
@@ -126,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));
}
@@ -154,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