diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java index b037bef8..dee68cb5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java @@ -39,5 +39,5 @@ public interface DictDetailRepository extends JpaRepository, J * @param label * @return */ - List findByLabel(String label); + List findByLabelAndDict_Id(String label, Long dict_id); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java index 0ece36c4..935e83d6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java @@ -62,7 +62,7 @@ public class DictDetailServiceImpl implements DictDetailService { @Override @Transactional(rollbackFor = Exception.class) public void create(DictDetail resources) { - List label = dictDetailRepository.findByLabel(resources.getLabel()); + List label = dictDetailRepository.findByLabelAndDict_Id(resources.getLabel(), resources.getDict().getId()); if (ObjectUtil.isNotEmpty(label)) throw new BadRequestException("字典[" + resources.getLabel() + "]已存在"); dictDetailRepository.save(resources); // 清理缓存