From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
start/src/main/java/com/ycl/web/controller/system/SysDictDataController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysDictDataController.java b/start/src/main/java/com/ycl/web/controller/system/SysDictDataController.java
index aa2ba0c..2f667d3 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysDictDataController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysDictDataController.java
@@ -97,6 +97,9 @@
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
+ if (dict.getDictCode().equals(dict.getParentId())) {
+ return error("淇敼瀛楀吀'" + dict.getDictLabel() + "'澶辫触锛屼笂绾у瓧鍏镐笉鑳介�夋嫨鑷繁");
+ }
dict.setUpdateBy(getUsername());
return toAjax(dictDataService.updateDictData(dict));
}
@@ -111,4 +114,26 @@
dictDataService.deleteDictDataByIds(dictCodes);
return success();
}
+
+
+ /**
+ * 鑾峰彇瀛楀吀鍒楄〃锛堜笉鍒嗛〉锛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ @GetMapping("/dataList")
+ public AjaxResult dataList(SysDictData dictData) {
+ List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+ return success(list);
+ }
+
+ /**
+ * 鏍规嵁鐖剁骇id鑾峰彇瀛愮骇鏁版嵁
+ */
+ @GetMapping("/child/by/parent/{parentId}")
+ public AjaxResult getChildList(@PathVariable("parentId") Long parentId) {
+ SysDictData dictData = new SysDictData();
+ dictData.setParentId(parentId);
+ List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+ return success(list);
+ }
}
--
Gitblit v1.8.0