|
|
|
@ -83,6 +83,9 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
|
|
|
|
|
// 如果查询条件中有原子指标名称,则根据原子指标名称过滤关联的指标id
|
|
|
|
|
List<ModelIndexAtomicRelationDTO> modelIndexAtomicDTOS = modelIndexAtomicRelationService.listByAtomicIndexName(modelIndex.getAtomicIndexName());
|
|
|
|
|
List<String> indexIdList = modelIndexAtomicDTOS.stream().map(ModelIndexAtomicRelationDTO::getModelIndexId).distinct().toList();
|
|
|
|
|
if (CollUtil.isEmpty(indexIdList)){
|
|
|
|
|
return R.ok(IPages.buildDataMap(iPage));
|
|
|
|
|
}
|
|
|
|
|
wrapper.in(CollUtil.isNotEmpty(indexIdList),ModelIndex::getId, indexIdList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|