From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/controller/DictBizController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/DictBizController.java b/src/main/java/org/springblade/modules/system/controller/DictBizController.java
index f64c48e..5c6d783 100644
--- a/src/main/java/org/springblade/modules/system/controller/DictBizController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DictBizController.java
@@ -75,8 +75,8 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "列表", notes = "传入dict")
- public R<List<DictBizVO>> list(@ApiIgnore @RequestParam Map<String, Object> dict) {
- List<DictBiz> list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort));
+ public R<List<DictBizVO>> list(@ApiIgnore DictBiz dict) {
+ List<DictBiz> list = dictService.list(Condition.getQueryWrapper(dict).lambda().orderByAsc(DictBiz::getSort));
return R.data(DictBizWrapper.build().listNodeVO(list));
}
@@ -115,8 +115,8 @@
@GetMapping("/tree")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "树形结构", notes = "树形结构")
- public R<List<DictBizVO>> tree() {
- List<DictBizVO> tree = dictService.tree();
+ public R<List<DictBizVO>> tree(@RequestParam(value = "code", required = false) String code) {
+ List<DictBizVO> tree = dictService.tree(code);
return R.data(tree);
}
@@ -161,7 +161,7 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "获取字典", notes = "获取字典")
public R<List<DictBiz>> dictionary(String code) {
- List<DictBiz> tree = dictService.getList(code);
+ List<DictBiz> tree = dictService.getList(code,null);
return R.data(tree);
}
@@ -172,7 +172,7 @@
@ApiOperationSupport(order = 9)
@ApiOperation(value = "获取字典树", notes = "获取字典树")
public R<List<DictBizVO>> dictionaryTree(String code) {
- List<DictBiz> tree = dictService.getList(code);
+ List<DictBiz> tree = dictService.getList(code,null);
return R.data(DictBizWrapper.build().listNodeVO(tree));
}
--
Gitblit v1.9.3