1

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

@@ -163,11 +163,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(param.getFolderId() != null){
                 List<ManageFolderScene> byFolderId = manageFolderSceneService.getByFolderId(param.getFolderId());
                 List<String> collect = byFolderId.stream().map(ManageFolderScene::getNum).collect(Collectors.toList());
-                param.getProjectNums().addAll(collect);
+                param.setFolderInNums(collect);
             }else {
                 List<ManageFolderScene> byFolderId = manageFolderSceneService.getType(param.getType());
                 List<String> collect = byFolderId.stream().map(ManageFolderScene::getNum).collect(Collectors.toList());
-                param.getNoInNums().addAll(collect);
+                param.setFolderNoInNums(collect);
             }
         }
 

src/main/java/com/fdkankan/manage_jp/vo/request/SceneParam.java

@@ -35,7 +35,8 @@ public class SceneParam extends RequestBase {
     private Integer id;
     private Integer projectId;
     private List<String> projectNums = new ArrayList<>();
-    private List<String> noInNums = new ArrayList<>();
+    private List<String> folderNoInNums = new ArrayList<>();
+    private List<String> folderInNums = new ArrayList<>();
     private Integer mapShow;
     private Integer isLaser;
 

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

@@ -132,13 +132,18 @@
                 #{num}
             </foreach>
         </if>
-        <if test="param.noInNums !=null and param.noInNums.size >0">
+        <if test="param.folderInNums !=null and param.folderInNums.size >0">
+            and  s.num  in
+            <foreach collection="param.folderInNums" item="num" open="(" separator="," close=")">
+                #{num}
+            </foreach>
+        </if>
+        <if test="param.folderNoInNums !=null and param.folderNoInNums.size >0">
             and  s.num not in
-            <foreach collection="param.noInNums" item="num" open="(" separator="," close=")">
+            <foreach collection="param.folderNoInNums" item="num" open="(" separator="," close=")">
                 #{num}
             </foreach>
         </if>
-
     </sql>
 
 </mapper>