Merge branch 'bug-move-f' into test

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

@@ -131,6 +131,9 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
                 if(!folderEntity.getType().equals(param.getType())){
                     throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
                 }
+                if(folderEntity.getParentId().equals(param.getParentId())){
+                    throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
+                }
                 List<Folder> byParentIdAndName = findByParentIdAndName(param.getParentId(), folderEntity.getName(), user.getId(),param.getType());
                 if(byParentIdAndName != null && byParentIdAndName.size() > 0){
                     //表示迁移回当前目录，不做处理