|
@@ -123,6 +123,7 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
|
|
if(StringUtils.isNotEmpty(param.getFolderIds())){
|
|
if(StringUtils.isNotEmpty(param.getFolderIds())){
|
|
String[] folderIds = param.getFolderIds().split(",");
|
|
String[] folderIds = param.getFolderIds().split(",");
|
|
Folder folderEntity = null;
|
|
Folder folderEntity = null;
|
|
|
|
+ List<LambdaUpdateWrapper<Folder>> ListWr = new ArrayList<>();
|
|
for (String folderId : folderIds) {
|
|
for (String folderId : folderIds) {
|
|
folderEntity = this.getById(Long.valueOf(folderId));
|
|
folderEntity = this.getById(Long.valueOf(folderId));
|
|
|
|
|
|
@@ -132,6 +133,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(param.getParentId().equals(folderEntity.getId())){
|
|
|
|
+ throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
|
|
|
|
+ }
|
|
Folder folder = this.getById(param.getParentId());
|
|
Folder folder = this.getById(param.getParentId());
|
|
if(folder == null){
|
|
if(folder == null){
|
|
throw new BusinessException(ErrorConstant.FAILURE_CODE_5050, ErrorConstant.FAILURE_MSG_5050);
|
|
throw new BusinessException(ErrorConstant.FAILURE_CODE_5050, ErrorConstant.FAILURE_MSG_5050);
|
|
@@ -148,8 +152,12 @@ public class FolderServiceImpl extends ServiceImpl<IFolderMapper, Folder> implem
|
|
}
|
|
}
|
|
throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
|
|
throw new BusinessException(SceneConstant.FAILURE_CODE_5030, SceneConstant.FAILURE_MSG_5030);
|
|
}
|
|
}
|
|
|
|
+ ListWr.add(wrapper);
|
|
|
|
+ }
|
|
|
|
+ for (LambdaUpdateWrapper<Folder> wrapper : ListWr) {
|
|
this.update(wrapper);
|
|
this.update(wrapper);
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
if(StringUtils.isNotEmpty(param.getSceneIds())){
|
|
if(StringUtils.isNotEmpty(param.getSceneIds())){
|
|
String[] sceneIds = param.getSceneIds().split(",");
|
|
String[] sceneIds = param.getSceneIds().split(",");
|