20260325稳定版

This commit is contained in:
2026-03-25 15:56:42 +08:00
parent 7119dc76a9
commit e718d25f19
217 changed files with 3864 additions and 7972 deletions
@@ -53,7 +53,6 @@ public class DictDataController extends BaseController {
return success(dictDataService.pageRel(param));
}
@PreAuthorize("hasAuthority('sys:dict:list')")
@OperationLog
@ApiOperation("查询全部字典数据")
@GetMapping()
@@ -79,11 +78,11 @@ public class DictDataController extends BaseController {
.eq(DictData::getDictDataName, dictData.getDictDataName())) > 0) {
return fail("字典数据名称已存在");
}
if (dictDataService.count(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictId, dictData.getDictId())
.eq(DictData::getDictDataCode, dictData.getDictDataCode())) > 0) {
return fail("字典数据标识已存在");
}
// if (dictDataService.count(new LambdaQueryWrapper<DictData>()
// .eq(DictData::getDictId, dictData.getDictId())
// .eq(DictData::getDictDataCode, dictData.getDictDataCode())) > 0) {
// return fail("字典数据标识已存在");
// }
// 自动添加字典
final int count = dictService.count(new LambdaQueryWrapper<Dict>().eq(Dict::getDictCode, dictData.getDictCode()));
if (dictData.getDictCode() != null && count == 0) {