离线包状态

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

@@ -165,15 +165,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
 
-        if(param.getType() == null || param.getType() == 2 || param.getType() == 5 || param.getType() == 57){
-            ssSceneMap = laserService.list(sceneNumList,null);
-//          ssSceneMap.putAll(laserService.list(sceneNumList,5));
-//        }else  if(param.getType() == 2 ){
-//            ssSceneMap = laserService.list(sceneNumList,4);
-//        }else  if(param.getType() == 5){
-//            ssSceneMap = laserService.list(sceneNumList,5);
-//        }else  if(param.getType() == 57){
-//            ssSceneMap = laserService.list(sceneNumList,57);
+        if(param.getIsLaser() == null){
+            if(param.getType() == null){
+                ssSceneMap = laserService.list(sceneNumList,4);
+                ssSceneMap.putAll(laserService.list(sceneNumList,5));
+            }else  if(param.getType() == 2 ){
+                ssSceneMap = laserService.list(sceneNumList,4);
+            }else  if(param.getType() == 5){
+                ssSceneMap = laserService.list(sceneNumList,5);
+            }else  if(param.getType() == 57){
+                ssSceneMap = laserService.list(sceneNumList,57);
+            }
         }
 
         HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);