|
@@ -142,10 +142,15 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
* @return
|
|
|
*/
|
|
|
public List<GetAllConceptDTO> getAllConcept(GetAllConceptVO getAllConceptVO) {
|
|
|
+ List<GetAllConceptDTO> getAllConceptDTOList = Lists.newArrayList();
|
|
|
+ if(StringUtil.isBlank(getAllConceptVO.getName())){
|
|
|
+ return getAllConceptDTOList;
|
|
|
+ }
|
|
|
+
|
|
|
QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<LibraryInfo>();
|
|
|
libraryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
libraryInfoQe.eq(getAllConceptVO.getIsConcept() != null, "is_concept", getAllConceptVO.getIsConcept());
|
|
|
- libraryInfoQe.like(StringUtil.isNotBlank(getAllConceptVO.getName()), "name", getAllConceptVO.getName());
|
|
|
+ libraryInfoQe.like("name", getAllConceptVO.getName());
|
|
|
List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
|
|
|
|
|
|
//过滤掉非概念术语
|
|
@@ -178,7 +183,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
}).collect(Collectors.toList());
|
|
|
}*/
|
|
|
|
|
|
- List<GetAllConceptDTO> getAllConceptDTOList = BeanUtil.listCopyTo(libraryInfoList, GetAllConceptDTO.class);
|
|
|
+ getAllConceptDTOList = BeanUtil.listCopyTo(libraryInfoList, GetAllConceptDTO.class);
|
|
|
getAllConceptDTOList.forEach(i -> {
|
|
|
i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
|
|
|
i.setNameAndType(i.getName() + "(" + i.getType() + ")");
|