1

src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -40,6 +40,8 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
     @Autowired
     ISceneProService sceneProService;
     @Autowired
+    ISceneService sceneService;
+    @Autowired
     IScenePlusService scenePlusService;
     @Autowired
     LaserService fdkkLaserService;

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

@@ -535,19 +535,22 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     public List<String> getSceneSource(String sceneSource){
         List<String> sceneSourceList ;
-        switch (sceneSource){
-            case "1" : sceneSourceList = Arrays.asList("1","2","12","13","14"); break;  //四维看看
-            case "3" : sceneSourceList = Collections.singletonList("3"); break;//四维看见
-            case "4" : sceneSourceList = Collections.singletonList("4"); break;//深时场景
-            default:
-                if(sceneSource.contains(",")){
-                    sceneSource = sceneSource + ",12,13,14";
-                    sceneSourceList = Arrays.asList(sceneSource.split(","));
-                    break;
-                }
-                sceneSourceList = Collections.singletonList(sceneSource);break;
+        if(StringUtils.isNotBlank(sceneSource)){
+            switch (sceneSource){
+                case "1" : sceneSourceList = Arrays.asList("1","2","12","13","14"); break;  //四维看看
+                case "3" : sceneSourceList = Collections.singletonList("3"); break;//四维看见
+                case "4" : sceneSourceList = Collections.singletonList("4"); break;//深时场景
+                default:
+                    if(sceneSource.contains(",")){
+                        sceneSource = sceneSource + ",12,13,14";
+                        sceneSourceList = Arrays.asList(sceneSource.split(","));
+                        break;
+                    }
+                    sceneSourceList = Collections.singletonList(sceneSource);break;
+            }
+            return sceneSourceList;
         }
-        return sceneSourceList;
+        return null;
     }
     @Override
     public void copyScene(String sceneNum,String userName) throws Exception {

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

@@ -106,10 +106,12 @@
     </sql>
 
     <sql id="commonSceneWhere">
-         scene_source in
-        <foreach item="sourceId" collection="param.sourceList" open="(" separator="," close=")">
-            #{sourceId}
-        </foreach>
+        <if test="param.sourceList!=null">
+            scene_source in
+            <foreach item="sourceId" collection="param.sourceList" open="(" separator="," close=")">
+                #{sourceId}
+            </foreach>
+        </if>
         <if test="param.folderId == null and param.hasFolder == 1 ">
             AND p.id not in(SELECT scene_id FROM t_folder_scene where rec_status = 'A')
         </if>