|
@@ -207,13 +207,9 @@ public class AssoGroupFeatureService extends ServiceImpl<AssoGroupFeatureMapper,
|
|
|
List<AssoGroupFeature> list = this.list(new LambdaQueryWrapper<AssoGroupFeature>()
|
|
|
.eq(AssoGroupFeature::getFeatureId, featureId1)
|
|
|
.eq(AssoGroupFeature::getGroupId, groupId1)
|
|
|
- .eq(AssoGroupFeature::getFeatureGen,0)
|
|
|
.orderByDesc(BaseEntity::getId));
|
|
|
if (!CollectionUtils.isEmpty(list)) {
|
|
|
assoGroupFeature = list.get(0);
|
|
|
- } else {
|
|
|
- //根据特征id查询证据组合和特征关联
|
|
|
- assoGroupFeature = this.getById(featureGroupId);
|
|
|
}
|
|
|
} else {
|
|
|
//根据特征id查询证据组合和特征关联
|