|
@@ -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() != null && 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());
|