Update unique judgment logic for dict data (#859)

This commit is contained in:
Wu Clan
2025-10-17 13:04:35 +08:00
committed by GitHub
parent a93973af06
commit 89e5d02fe2
3 changed files with 12 additions and 10 deletions
@@ -94,13 +94,12 @@ class DictDataService:
:param obj: 字典数据创建参数
:return:
"""
dict_data = await dict_data_dao.get_by_label(db, obj.label)
if dict_data:
raise errors.ConflictError(msg='字典数据已存在')
dict_type = await dict_type_dao.get(db, obj.type_id)
if not dict_type:
raise errors.NotFoundError(msg='字典类型不存在')
dict_data = await dict_data_dao.get_by_label_and_type_code(db, obj.label, dict_type.code)
if dict_data:
raise errors.ConflictError(msg='字典数据已存在')
await dict_data_dao.create(db, obj, dict_type.code)
@staticmethod
@@ -117,11 +116,13 @@ class DictDataService:
dict_data = await dict_data_dao.get(db, pk)
if not dict_data:
raise errors.NotFoundError(msg='字典数据不存在')
if dict_data.label != obj.label and await dict_data_dao.get_by_label(db, obj.label):
raise errors.ConflictError(msg='字典数据已存在')
dict_type = await dict_type_dao.get(db, obj.type_id)
if not dict_type:
raise errors.NotFoundError(msg='字典类型不存在')
if dict_data.label != obj.label and await dict_data_dao.get_by_label_and_type_code(
db, obj.label, dict_type.code
):
raise errors.ConflictError(msg='字典数据已存在')
count = await dict_data_dao.update(db, pk, obj, dict_type.code)
return count