1

doc/update1.10.9.sql

@@ -87,3 +87,4 @@ CREATE TABLE `t_product_order`  (
 -- ----------------------------
 
 SET FOREIGN_KEY_CHECKS = 1;
+

src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -405,8 +405,10 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         List<String> numList2 = collect2.stream().map(ScenePlus::getNum).collect(Collectors.toList());
         numList1.addAll(numList2);
         List<String> collect = userList.stream().map(User::getUserName).collect(Collectors.toList());
-
-        List<String> snCodeList = cameraList.stream().map(Camera::getSnCode).collect(Collectors.toList());
+        List<String> snCodeList = null;
+        if(cameraList !=null ){
+            snCodeList = cameraList.stream().map(Camera::getSnCode).collect(Collectors.toList());
+        }
         laserService.saveBatchCooperation(numList2,snCodeList,LoginUser.getUserName(),collect,type);
 
     }