1

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

@@ -396,31 +396,32 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         Page<SceneVo> page ;
         SceneTypeEnum enumByType ;
-        if(param.getIsObj() != null){
-            if(param.getIsObj() == 0){
-                page = this.getBaseMapper().selectLaser(new Page<>(param.getPageNum(),param.getPageSize()),param);
-            }else {
-                page = this.getBaseMapper().selectMesh(new Page<>(param.getPageNum(),param.getPageSize()),param);
-            }
-        }else {
-            if(param.getType() == null){
-                page = this.getBaseMapper().pageList2(new Page<>(param.getPageNum(),param.getPageSize()),param);
-            }else {
-                enumByType = SceneTypeEnum.getEnumByType(param.getType());
-                if(enumByType == null){
-                    throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
-                }
-                param.setSceneSource(enumByType.getSceneSource());
-                if(enumByType.getThreeCamera()){
-                    param.setThreeCamType(true);
-                }else {
-                    param.setNotThreeCamType(true);
-                }
-                if(enumByType.getLaser()){
+
+        if(param.getType() == null){
+            if(param.getIsObj() != null){
+                if(param.getIsObj() == 0){
                     page = this.getBaseMapper().selectLaser(new Page<>(param.getPageNum(),param.getPageSize()),param);
                 }else {
                     page = this.getBaseMapper().selectMesh(new Page<>(param.getPageNum(),param.getPageSize()),param);
                 }
+            }else {
+                page = this.getBaseMapper().pageList2(new Page<>(param.getPageNum(),param.getPageSize()),param);
+            }
+        }else {
+            enumByType = SceneTypeEnum.getEnumByType(param.getType());
+            if(enumByType == null){
+                throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
+            }
+            param.setSceneSource(enumByType.getSceneSource());
+            if(enumByType.getThreeCamera()){
+                param.setThreeCamType(true);
+            }else {
+                param.setNotThreeCamType(true);
+            }
+            if(enumByType.getLaser()){
+                page = this.getBaseMapper().selectLaser(new Page<>(param.getPageNum(),param.getPageSize()),param);
+            }else {
+                page = this.getBaseMapper().selectMesh(new Page<>(param.getPageNum(),param.getPageSize()),param);
             }
         }