1

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -124,8 +124,10 @@ public class SceneService implements ISceneService {
         if(param.getType() == 2 || param.getType() == 5){
             List<String> laserNumList = sceneVoPage.getRecords().stream().filter(e-> e.getSceneSource() == 4 || e.getSceneSource() == 5)
                     .map(SceneVo::getNum).collect(Collectors.toList());
-            List<JSONObject> laserList = scenePlusService.getLaserScene(laserNumList);
-            laserList.forEach(e->laserMap.put(e.getString("scene_code"),e));
+            if(!laserNumList.isEmpty()){
+                List<JSONObject> laserList = scenePlusService.getLaserScene(laserNumList);
+                laserList.forEach(e->laserMap.put(e.getString("scene_code"),e));
+            }
         }
 
         List<String> modelingScene = sceneVoPage.getRecords().stream().filter(e -> e.getStatus() == 0).map(SceneVo::getNum).collect(Collectors.toList());

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

@@ -74,14 +74,14 @@
     </select>
 
     <select id="getLaserScene" resultType="com.alibaba.fastjson.JSONObject">
-        select * from fdkk_laser.t_scene where scene_code in
+        select * from fdkk_laser.t_scene where deleted = 0 and scene_code in
             <foreach collection="laserNumList" item="num" open="(" separator="," close=")">
                  #{num}
             </foreach>
     </select>
 
     <select id="getLaserSceneByName" resultType="com.alibaba.fastjson.JSONObject">
-        select * from fdkk_laser.t_scene where title
+        select * from fdkk_laser.t_scene where deleted = 0 and title
             like concat ('%',#{sceneName},'%')
     </select>
 </mapper>