移动场景失败

src/main/java/com/fdkankan/ucenter/entity/Folder.java

@@ -53,7 +53,6 @@ public class Folder implements Serializable {
     private Long parentId;
 
     @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
     @TableField("create_time")

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

@@ -144,16 +144,12 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
         }
         if(StringUtils.isNotEmpty(param.getSceneIds())){
             String[] sceneIds = param.getSceneIds().split(",");
-
             FolderScene folderSceneEntity = null;
-
             for (String sceneId : sceneIds) {
-
                 folderSceneEntity = folderSceneService.getByType(Long.valueOf(sceneId), param.getType());
                 if(folderSceneEntity != null){
                     folderSceneService.removeById(folderSceneEntity.getId());
                 }
-
                 if(param.getParentId() != null){
                     Folder folderEntity = getById(param.getParentId());
                     if(!folderEntity.getType().equals(param.getType())){

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

@@ -360,7 +360,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
             }
         }
-        if(param.getSceneSource()!= null && param.getSceneSource().equals("1") && param.getPageNum() == 1){         //增加双目文件夹
+        if(param.getSceneSource()!= null && param.getSceneSource().equals("1")
+                && param.getPageNum() == 1 && param.getHasFolder() == 1 && param.getFolderId() == null){         //增加双目文件夹
             SceneVo sceneVo = new SceneVo();
             sceneVo.setId(-1L);
             sceneVo.setIsFolder(1);

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

@@ -98,10 +98,10 @@
             #{sourceId}
         </foreach>
         <if test="param.folderId == null">
-            AND p.id not in(SELECT scene_id FROM t_folder_scene )
+            AND p.id not in(SELECT scene_id FROM t_folder_scene where rec_status = 'A')
         </if>
         <if test="param.folderId != null">
-            AND p.id in (SELECT scene_id FROM t_folder_scene where folder_id =#{param.folderId} )
+            AND p.id in (SELECT scene_id FROM t_folder_scene where rec_status= 'A' and folder_id =#{param.folderId} )
         </if>
         <if test="param.numList !=null and param.numList.size >0">
             and num in