diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/domain/Dictionary.java b/archives/src/main/java/com/storeroom/modules/dictionary/domain/Dictionary.java index b146f8b..457062d 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/domain/Dictionary.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/domain/Dictionary.java @@ -24,7 +24,7 @@ public class Dictionary extends BaseEntity implements Serializable { @Column(name = "dic_name") @ApiModelProperty(value = "名称") private String dicName; - + @Column(name = "dic_code") @ApiModelProperty(value = "代码") diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java index 2ba67b5..3a60962 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java @@ -4,6 +4,7 @@ import com.storeroom.modules.dictionary.domain.ArchivesDictionary; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; @@ -37,8 +38,9 @@ public interface ArchivesDictionaryRepository extends JpaRepository querybyName(String fName,String fcName); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java index 0620373..86b8fba 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java @@ -6,7 +6,6 @@ import com.storeroom.modules.dictionary.domain.ArchivesDictionary; import com.storeroom.modules.dictionary.repository.ArchivesDictionaryRepository; import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO; -import com.storeroom.modules.dictionary.service.dto.ArchivesTypeDTO; import com.storeroom.modules.dictionary.service.mapstruct.ArchivesDictionaryMapper; import com.storeroom.utils.NanoIdUtils; import com.storeroom.utils.ValidationUtil; @@ -93,8 +92,8 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { @Override public void create(ArchivesDictionaryDTO arcdicDto) { ArchivesDictionary arc = archivesDictionaryMapper.toEntity(arcdicDto); - ArchivesDictionary arc1 = archivesDictionaryRepository.findByName(arc.getFieldCnName(), arc.getFieldName()); - if (arc1==null){ + List arc1 = archivesDictionaryRepository.querybyName(arc.getFieldName(), arc.getFieldCnName()); + if (arc1.size() == 0) { arcdicDto.setId(NanoIdUtils.randomNanoId()); archivesDictionaryRepository.save(archivesDictionaryMapper.toEntity(arcdicDto)); }