取交集

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -115,7 +115,17 @@ public class LaserService {
         }
         if(StringUtils.isNotBlank(param.getUserName())){
             List<CameraDetail> cameraDetails = cameraDetailService.getByUserName(param.getUserName());
-            param.setSnCodes(this.setSnCodes(cameraDetails));
+            List<String> snCodes = this.setSnCodes(cameraDetails);
+            if(param.getCompanyId() == null){
+                param.setSnCodes(snCodes);
+            }else {
+                if(snCodes == null || snCodes.size() <=0){
+                    return null;
+                }
+                //取交集
+                List<String> intersection = param.getSnCodes().stream().filter(snCodes::contains).collect(Collectors.toList());
+                param.setSnCodes(intersection);
+            }
         }
         if(StringUtils.isNotBlank(param.getUserName()) && StringUtils.isBlank(param.getSnCode()) &&
                 (param.getSnCodes() == null || param.getSnCodes().size() <=0)){