浏览代码

查询文件夹,过滤自己和子文件夹

lyhzzz 2 年之前
父节点
当前提交
cefa9382b1

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/FolderController.java

@@ -104,7 +104,7 @@ public class FolderController extends BaseController {
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
 
-        List<Folder> list = folderService.findByUserIdAndType(user.getId(), param.getType(), param.getName());
+        List<Folder> list = folderService.findByUserIdAndType(user.getId(), param.getType(), param.getName(),param.getFolderId());
 
         return Result.success(list);
     }

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

@@ -32,5 +32,5 @@ public interface IFolderService extends IService<Folder> {
 
     List<Folder> getAllFolderIds(List<Long> folderIds);
 
-    List<Folder> findByUserIdAndType(Long userId, Integer type, String name);
+    List<Folder> findByUserIdAndType(Long userId, Integer type, String name,Long folderId);
 }

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

@@ -239,8 +239,12 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
     }
 
     @Override
-    public List<Folder> findByUserIdAndType(Long userId, Integer type, String name) {
+    public List<Folder> findByUserIdAndType(Long userId, Integer type, String name,Long folderId) {
         LambdaQueryWrapper<Folder> wrapper = new LambdaQueryWrapper<>();
+        if(folderId != null){
+            wrapper.ne(Folder::getId,folderId);
+            wrapper.ne(Folder::getParentId,folderId);
+        }
         wrapper.eq(Folder::getUserId,userId);
         wrapper.eq(Folder::getType,type);
         if(StringUtils.isNotBlank(name)){

+ 2 - 0
src/main/java/com/fdkankan/ucenter/vo/request/RequestFolder.java

@@ -22,4 +22,6 @@ public class RequestFolder {
     private String folderIds;
 
     private String sceneIds;
+
+    private Long folderId;
 }