|
|
@@ -53,6 +53,7 @@ import org.springblade.core.mp.support.Condition;
|
|
|
import org.springblade.core.mp.support.Query;
|
|
|
import org.springblade.core.secure.BladeUser;
|
|
|
import org.springblade.core.tool.api.R;
|
|
|
+import org.springblade.core.tool.utils.BeanUtil;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.manager.entity.ArchiveTreeContract;
|
|
|
import org.springblade.manager.entity.ContractInfo;
|
|
|
@@ -1258,10 +1259,11 @@ public class ArchivesAutoController extends BladeController {
|
|
|
return R.fail("参数错误");
|
|
|
}
|
|
|
List<ArchiveFileVO> updateArchiveFileList = new ArrayList<>();
|
|
|
+ List<ArchiveFileVO> oldList = new ArrayList<>();
|
|
|
String[] split1 = vo.getSortFileList().split(",");
|
|
|
List<ArchiveFile> targetArchiveFileList = archiveFileClient.getArchiveFileByArchiveIds(target.getId() + "");
|
|
|
targetArchiveFileList.addAll(sourceArchiveFileList);
|
|
|
- Map<Long, ArchiveFile> targetMap = targetArchiveFileList.stream().collect(Collectors.toMap(ArchiveFile::getId, item -> item, (k1, k2) -> k1));
|
|
|
+ Map<Long, ArchiveFile> targetMap = targetArchiveFileList.stream().peek(item -> oldList.add(BeanUtil.copyProperties( item,ArchiveFileVO.class))).collect(Collectors.toMap(ArchiveFile::getId, item -> item, (k1, k2) -> k1));
|
|
|
Map<Long, ArchiveFile> map = sourceArchiveFileList.stream().collect(Collectors.toMap(ArchiveFile::getId, item -> item));
|
|
|
for (String s : split1) {
|
|
|
if (StringUtils.isNumeric(s)) {
|
|
|
@@ -1287,6 +1289,7 @@ public class ArchivesAutoController extends BladeController {
|
|
|
}
|
|
|
ArchiveFileVO fileVO = new ArchiveFileVO();
|
|
|
fileVO.setList(updateArchiveFileList);
|
|
|
+ fileVO.setOldList(oldList);
|
|
|
archiveFileClient.updateArchiveFileSort(fileVO);
|
|
|
return R.status(true);
|
|
|
}
|
lvy