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