1

src/main/java/com/fdkankan/ucenter/controller/api/LaserController.java

@@ -64,11 +64,14 @@ public class LaserController extends BaseController {
             return Result.success(map);
         }
         List<CameraAppVo> camera = new ArrayList<>();
+        for (Long userId : userIds) {
+
+        }
         if(sceneSource.contains(",")){
             String[] split = sceneSource.split(",");
             for (String resource : split) {
                 if("4".equals(resource)){
-                    camera.addAll( cameraDetailService.getListByUserIdsAndType(userIds, 10));
+                    camera.addAll( cameraDetailService.getListByUserAndType(userIds, 10));
                 }
                 if("5".equals(resource)){
                     camera.addAll(cameraDetailService.getListByUserIdsAndType(userIds, 11));

src/main/resources/mapper/ucenter/CameraMapper.xml

@@ -22,9 +22,12 @@
         <if test="param.cameraType!=null and param.cameraType == 4">
             and d.type in (0,1,2)
         </if>
-        <if test="param.cameraType!=null and param.cameraType >= 9">
+        <if test="param.cameraType!=null and param.cameraType == 9">
             and d.type = #{param.cameraType}
         </if>
+        <if test="param.cameraType!=null and ( param.cameraType == 10 or param.cameraType == 11 )">
+            and d.type in (10,11)
+        </if>
         <if test="param.companyId!=null">
             and d.company_id = #{param.companyId}
         </if>