代码合并

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

@@ -495,9 +495,11 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             // 根据关联信息获得对比记录ID
             List<Integer> recordsId = assoRecordsFeatures.stream().map(AssoRecordsFeature::getRecordsId).collect(Collectors.toList());
             //根据对比记录ID获得对比记录信息
-            LambdaQueryWrapper<CompareRecords> queryWrapper2 = new LambdaQueryWrapper<>();
-            queryWrapper2.in(CompareRecords::getId, recordsId);
-            compareRecords = compareRecordsService.list(queryWrapper2);
+            if (recordsId != null && recordsId.size() > 0) {
+                LambdaQueryWrapper<CompareRecords> queryWrapper2 = new LambdaQueryWrapper<>();
+                queryWrapper2.in(CompareRecords::getId, recordsId);
+                compareRecords = compareRecordsService.list(queryWrapper2);
+            }
         }
         //装载信息
         List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();