|
@@ -155,8 +155,8 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
.collect(Collectors.toList());
|
|
|
if (ListUtil.isNotEmpty(conceptIdList)) {
|
|
|
QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
|
|
|
- conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
- .in("concept_id", conceptIdList);
|
|
|
+ //conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
+ conceptDetailQueryWrapper.in("concept_id", conceptIdList);
|
|
|
List<ConceptDetail> conceptDetailList = conceptDetailFacade.list(conceptDetailQueryWrapper);
|
|
|
Map<Long, List<ConceptDetail>> detailMap
|
|
|
= EntityUtil.makeEntityListMap(conceptDetailList, "conceptId");
|
|
@@ -172,6 +172,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
}
|
|
|
for (ConceptDetail detail : detailMap.get(item.getId())) {
|
|
|
item.setHasInfo(1);
|
|
|
+ if (detail.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
List<String> contentTypeList = Arrays.asList(detail.getContentType().split(","));
|
|
|
if (contentTypeList.contains("1")) {
|
|
|
item.setHasStaticKnowledge(1);
|