lyhzzz 2 anos atrás
pai
commit
7573dac995

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -550,7 +550,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             return sceneSourceList;
         }
-        return null;
+        return Arrays.asList("0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15");
     }
     @Override
     public void copyScene(String sceneNum,String userName) throws Exception {

+ 4 - 6
src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -106,12 +106,10 @@
     </sql>
 
     <sql id="commonSceneWhere">
-        <if test="param.sourceList!=null">
-            scene_source in
-            <foreach item="sourceId" collection="param.sourceList" open="(" separator="," close=")">
-                #{sourceId}
-            </foreach>
-        </if>
+        scene_source in
+        <foreach item="sourceId" collection="param.sourceList" open="(" separator="," close=")">
+            #{sourceId}
+        </foreach>
         <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>