Merge branch 'lyh-bug' into test

src/main/java/com/fdkankan/ucenter/common/BaseController.java

@@ -1,5 +1,7 @@
 package com.fdkankan.ucenter.common;
 
+import cn.hutool.core.map.TolerantMap;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.DateEditor;
 import com.fdkankan.common.util.JwtUtil;
@@ -93,7 +95,11 @@ public class BaseController {
     }
 
     protected String getToken(){
-        return request.getHeader("token");
+        String token = request.getHeader("token");
+        if(StringUtils.isEmpty(token)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_3004);
+        }
+        return token;
     }
     protected Long getUserId(){
         String token = request.getHeader("token");

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

@@ -133,15 +133,17 @@ 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(param.getParentId().equals(folderEntity.getId())){
-                    throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
-                }
-                Folder folder = this.getById(param.getParentId());
-                if(folder == null){
-                    throw new BusinessException(ErrorConstant.FAILURE_CODE_5050, ErrorConstant.FAILURE_MSG_5050);
-                }
-                if(folder.getParentId() != null && folder.getParentId().equals(folderEntity.getId())){
-                    throw new BusinessException(ErrorConstant.FAILURE_CODE_5051, ErrorConstant.FAILURE_MSG_5051);
+                if(param.getParentId() != null){ //移动到根目录
+                    if(param.getParentId().equals(folderEntity.getId())){
+                        throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
+                    }
+                    Folder folder = this.getById(param.getParentId());
+                    if(folder == null){
+                        throw new BusinessException(ErrorConstant.FAILURE_CODE_5050, ErrorConstant.FAILURE_MSG_5050);
+                    }
+                    if(folder.getParentId() != null && folder.getParentId().equals(folderEntity.getId())){
+                        throw new BusinessException(ErrorConstant.FAILURE_CODE_5051, ErrorConstant.FAILURE_MSG_5051);
+                    }
                 }
 
                 List<Folder> byParentIdAndName = findByParentIdAndName(param.getParentId(), folderEntity.getName(), user.getId(),param.getType());