Kaynağa Gözat

修复文件夹名称重复

lyhzzz 2 yıl önce
ebeveyn
işleme
e0e277269d

+ 6 - 2
src/main/java/com/fdkankan/ucenter/service/impl/FolderServiceImpl.java

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