|
@@ -221,11 +221,15 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
|
|
|
private List<Folder> findByParentIdAndName(Long parentId, String name, Long userId, Integer type){
|
|
|
LambdaQueryWrapper<Folder> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(Folder::getName,name)
|
|
|
- .eq(Folder::getUserId,userId)
|
|
|
- .eq(Folder::getParentId,parentId);
|
|
|
+ .eq(Folder::getUserId,userId);
|
|
|
if(type !=null){
|
|
|
wrapper.eq(Folder::getType,type);
|
|
|
}
|
|
|
+ if(parentId!= null){
|
|
|
+ wrapper.eq(Folder::getParentId,parentId);
|
|
|
+ }else {
|
|
|
+ wrapper.isNull(Folder::getParentId);
|
|
|
+ }
|
|
|
return this.list(wrapper);
|
|
|
}
|
|
|
|