1

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -106,7 +106,11 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             typeHashMap.put(cameraType.getCameraType().toString(),cameraType);
         }
         for (CameraDetailVo record : voPage.getRecords()) {
-            record.setTypeStr(typeHashMap.get(record.getType()).getName());
+            CameraType cameraType = typeHashMap.get(record.getType());
+            if(cameraType != null){
+                record.setTypeStr(cameraType.getName());
+            }
+
         }
         return PageInfo.PageInfo(voPage);
     }

src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -4,9 +4,6 @@
 
     <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByCount" >
         SELECT user_id as id, count(p.id) as count FROM t_scene_plus p
-        <if test="isObj != null and isObj == 1">
-            left join t_scene_plus_ext e on p.id = e.plus_id
-        </if>
         WHERE  p.rec_status = 'A'
         and  p.user_id in
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">