|
@@ -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)){
|