提交 771102fa 作者: obcy

【fix标签信息源】

上级 daf631d0
...@@ -422,8 +422,7 @@ public class ConfigurationMessageService { ...@@ -422,8 +422,7 @@ public class ConfigurationMessageService {
} }
//查询排除的标签信息源id //查询排除的标签信息源id
List<SubjectInfoSourceMap> excludeInfoSourceLabel = iSubjectInfoSourceMapService.list(Wrappers.<SubjectInfoSourceMap>lambdaQuery() List<SubjectInfoSourceMap> excludeInfoSourceLabel = iSubjectInfoSourceMapService.list(Wrappers.<SubjectInfoSourceMap>lambdaQuery()
.select(SubjectInfoSourceMap::getSourceId) .select(SubjectInfoSourceMap::getSourceId,SubjectInfoSourceMap::getSourceItemId)
.select(SubjectInfoSourceMap::getSourceItemId)
.eq(SubjectInfoSourceMap::getSubjectId, subjectId) .eq(SubjectInfoSourceMap::getSubjectId, subjectId)
.eq(SubjectInfoSourceMap::getType, BindTypeEnum.EXCLUDE_INFO_SOURCE_LABEL.getvalue()) .eq(SubjectInfoSourceMap::getType, BindTypeEnum.EXCLUDE_INFO_SOURCE_LABEL.getvalue())
); );
...@@ -441,7 +440,7 @@ public class ConfigurationMessageService { ...@@ -441,7 +440,7 @@ public class ConfigurationMessageService {
); );
if (CollectionUtil.isNotEmpty(list)){ if (CollectionUtil.isNotEmpty(list)){
List<String> infoSourceCodes = list.stream().map(ClbLabelInfoSourceMap::getEntityCode).distinct().collect(Collectors.toList()); List<String> infoSourceCodes = list.stream().map(ClbLabelInfoSourceMap::getEntityCode).distinct().collect(Collectors.toList());
List<InfoSource> list1 = iInfoSourceService.list(Wrappers.<InfoSource>lambdaQuery().select(InfoSource::getId).in(InfoSource::getInfoSourceCode, infoSourceCodes)); List<InfoSource> list1 = iInfoSourceService.list(Wrappers.<InfoSource>lambdaQuery().select(InfoSource::getId).in(InfoSource::getId, infoSourceCodes));
if (CollectionUtil.isNotEmpty(list1)){ if (CollectionUtil.isNotEmpty(list1)){
List<String> collect = list1.stream().map(InfoSource::getId).collect(Collectors.toList()); List<String> collect = list1.stream().map(InfoSource::getId).collect(Collectors.toList());
excludeIds.addAll(collect); excludeIds.addAll(collect);
...@@ -478,8 +477,7 @@ public class ConfigurationMessageService { ...@@ -478,8 +477,7 @@ public class ConfigurationMessageService {
} }
//查询绑定的标签信息源id //查询绑定的标签信息源id
List<SubjectInfoSourceMap> excludeInfoSourceLabel = iSubjectInfoSourceMapService.list(Wrappers.<SubjectInfoSourceMap>lambdaQuery() List<SubjectInfoSourceMap> excludeInfoSourceLabel = iSubjectInfoSourceMapService.list(Wrappers.<SubjectInfoSourceMap>lambdaQuery()
.select(SubjectInfoSourceMap::getSourceId) .select(SubjectInfoSourceMap::getSourceId,SubjectInfoSourceMap::getSourceItemId)
.select(SubjectInfoSourceMap::getSourceItemId)
.eq(SubjectInfoSourceMap::getSubjectId, subjectId) .eq(SubjectInfoSourceMap::getSubjectId, subjectId)
.in(SubjectInfoSourceMap::getType, Arrays.asList(BindTypeEnum.INFO_SOURCE_LABEL.getvalue(),BindTypeEnum.DIRECTIONA_INFO_SOURCE_LABEL.getvalue())) .in(SubjectInfoSourceMap::getType, Arrays.asList(BindTypeEnum.INFO_SOURCE_LABEL.getvalue(),BindTypeEnum.DIRECTIONA_INFO_SOURCE_LABEL.getvalue()))
); );
...@@ -497,7 +495,7 @@ public class ConfigurationMessageService { ...@@ -497,7 +495,7 @@ public class ConfigurationMessageService {
); );
if (CollectionUtil.isNotEmpty(list)){ if (CollectionUtil.isNotEmpty(list)){
List<String> infoSourceCodes = list.stream().map(ClbLabelInfoSourceMap::getEntityCode).distinct().collect(Collectors.toList()); List<String> infoSourceCodes = list.stream().map(ClbLabelInfoSourceMap::getEntityCode).distinct().collect(Collectors.toList());
List<InfoSource> list1 = iInfoSourceService.list(Wrappers.<InfoSource>lambdaQuery().select(InfoSource::getId).in(InfoSource::getInfoSourceCode, infoSourceCodes)); List<InfoSource> list1 = iInfoSourceService.list(Wrappers.<InfoSource>lambdaQuery().select(InfoSource::getId).in(InfoSource::getId, infoSourceCodes));
if (CollectionUtil.isNotEmpty(list1)){ if (CollectionUtil.isNotEmpty(list1)){
List<String> collect = list1.stream().map(InfoSource::getId).collect(Collectors.toList()); List<String> collect = list1.stream().map(InfoSource::getId).collect(Collectors.toList());
excludeIds.addAll(collect); excludeIds.addAll(collect);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论