代码合并

RMS/src/main/java/cn/cslg/report/service/business/CompareScenariosService.java

@@ -116,7 +116,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             //获得对比方案的特征列表
             List<Features> featuresLists =allFeatures.stream().filter(item->item.getRightId().equals(a.getRightId())).collect(Collectors.toList());
             //根据对比方案ID获得所有对比方案和对比记录关联信息
-            List<AssoScenarIOS> select = selects.stream().filter(item->item.getScenariosID()==a.getId()).collect(Collectors.toList());
+            List<AssoScenarIOS> select = selects.stream().filter(item->item.getScenariosID().equals(a.getId())).collect(Collectors.toList());
             //获得Id不为0的对比记录和特征关联Id
             List<Integer> featureRecordIds = select.stream().filter(item->item.getFeatureRecordID()!=0).map(AssoScenarIOS::getFeatureRecordID).collect(Collectors.toList());
             //根据关联Id获得特征Id和对比记录ID