|
@@ -24,8 +24,7 @@ public class AppDictController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/dictTree")
|
|
|
public AjaxResult dictTree(DataDict dataDict) {
|
|
|
- String type = dataDict.getType();
|
|
|
- List list = dataDictService.dictTree(type);
|
|
|
+ List list = dataDictService.dictTree(dataDict.getType(), dataDict.getResultType());
|
|
|
if(!list.isEmpty() && null != list){
|
|
|
return AjaxResult.success(list);
|
|
|
}else{
|
|
@@ -38,8 +37,7 @@ public class AppDictController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/dictByPid")
|
|
|
public AjaxResult dictByPid(DataDict dataDict) {
|
|
|
- Long parentId = dataDict.getParentId();
|
|
|
- List list = dataDictService.dictByPid(parentId);
|
|
|
+ List list = dataDictService.dictByPid(dataDict.getParentId() , dataDict.getType());
|
|
|
if(!list.isEmpty() && null != list){
|
|
|
return AjaxResult.success(list);
|
|
|
}else{
|