From 10b7d4aad86d59b48cfbf19da6146096c97a5d29 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Tue, 12 Mar 2024 21:27:53 +0800 Subject: [PATCH] update --- .../impl/DocumentSplitServiceImpl.java | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java index 0fee9a0..9c76f00 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -763,23 +763,41 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { sarFileSplitItemsValEOSList.addAll(documentSplitMapper.queryItemsValByItemId(id, "")); } List sarFileSplitItemsValEOS = documentSplitMapper.queryItemsValByItemId((String) firstData.get(ID), ""); - // 第一条数据信息的最大的排序字段值 - Optional sarFileSplitItemsValEOOptional = sarFileSplitItemsValEOS.stream().sorted(Comparator.comparing(v -> Integer.valueOf(String.valueOf(v.getDisplaySeq())))).findFirst(); - sarFileSplitItemsValEOOptional.ifPresent(v ->{ - // 排序字段 - Integer displaySeq = v.getDisplaySeq(); -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String userId = ""; - for (SarFileSplitItemsValEO fileSplitItemsValEO : sarFileSplitItemsValEOSList) { - displaySeq += 1; - fileSplitItemsValEO.setItemId(v.getItemId()); - fileSplitItemsValEO.setDisplaySeq(displaySeq); - fileSplitItemsValEO.setModifyTime(new Date()); - fileSplitItemsValEO.setModifyUser(userId); - // 修改数据 - sarFileSplitItemsValEOMapper.updateByPrimaryKeySelective(fileSplitItemsValEO); - } - } ); + Integer displaySeq = 0; + String itemId = ""; + if (CollectionUtils.isNotEmpty(sarFileSplitItemsValEOS)) { + displaySeq = sarFileSplitItemsValEOS.get(sarFileSplitItemsValEOS.size() - 1).getDisplaySeq(); + itemId = sarFileSplitItemsValEOS.get(sarFileSplitItemsValEOS.size() - 1).getItemId(); + } + + // 排序字段 + String userId = ""; + for (SarFileSplitItemsValEO fileSplitItemsValEO : sarFileSplitItemsValEOSList) { + displaySeq += 1; + fileSplitItemsValEO.setItemId(itemId); + fileSplitItemsValEO.setDisplaySeq(displaySeq); + fileSplitItemsValEO.setModifyTime(new Date()); + fileSplitItemsValEO.setModifyUser(userId); + // 修改数据 + sarFileSplitItemsValEOMapper.updateByPrimaryKeySelective(fileSplitItemsValEO); + } +// // 第一条数据信息的最大的排序字段值 +// Optional sarFileSplitItemsValEOOptional = sarFileSplitItemsValEOS.stream().sorted(Comparator.comparing(v -> Integer.valueOf(String.valueOf(v.getDisplaySeq())))).findFirst(); +// sarFileSplitItemsValEOOptional.ifPresent(v ->{ +// // 排序字段 +// displaySeq = v.getDisplaySeq(); +//// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String userId = ""; +// for (SarFileSplitItemsValEO fileSplitItemsValEO : sarFileSplitItemsValEOSList) { +// displaySeq += 1; +// fileSplitItemsValEO.setItemId(v.getItemId()); +// fileSplitItemsValEO.setDisplaySeq(displaySeq); +// fileSplitItemsValEO.setModifyTime(new Date()); +// fileSplitItemsValEO.setModifyUser(userId); +// // 修改数据 +// sarFileSplitItemsValEOMapper.updateByPrimaryKeySelective(fileSplitItemsValEO); +// } +// } ); } @Override