From c733d08b2ddcbda4bd688bde38713887ebe91244 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 20 二月 2025 14:58:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
start/src/main/java/com/ycl/web/controller/system/SysDictDataController.java | 14 ++++++++++++++
1 files changed, 14 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..97bf97d 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,15 @@
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);
+ }
}
--
Gitblit v1.8.0