From 4fb23327373175bcaf605364dbb2a24666dd846d Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 14 Nov 2023 15:52:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=B9?= =?UTF-8?q?=E6=AF=94):=2078387?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSplitServiceImpl.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 86fd554f..58d64c99 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -113,6 +113,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { private static final String INTERPRETATION_ARTICLES = "interpretation_articles"; private static final String INTERPRETATION_ARTICLES_LIST = "interpretationArticlesList"; private static final String MENU_ID = "menu_id"; + private static final String CREATE_TIME = "create_time"; public DocumentSplitServiceImpl(DocumentSplitMapper documentSplitMapper, ISarFileSplitInfoService sarFileSplitInfoService, LawsCommonMapper lawsCommonMapper, @@ -649,13 +650,18 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { @Override public void deleteDocumentSplitDetail(Map parameter) { String id = (String) parameter.get(ID); - // 获取原始据信息 - Map documentSplitDetail = documentSplitMapper.queryDocumentSplitDetailById(id); - String menuId = (String) documentSplitDetail.get(MENU_ID); + // 删除文档拆分详情数据 documentSplitMapper.deleteDocumentSplitDetail(id); - // 删除对应目录 - documentSplitMapper.sarFileSplitMenuDeleteByIdList(Collections.singletonList(menuId)); + + /** + * // 获取原始据信息 + * Map documentSplitDetail = documentSplitMapper.queryDocumentSplitDetailById(id); + * String menuId = (String) documentSplitDetail.get(MENU_ID); + * // 删除对应目录 + * documentSplitMapper.sarFileSplitMenuDeleteByIdList(Collections.singletonList(menuId)); + */ + //删除对应条目信息 // 条款解读 documentSplitMapper.deleteItemsValByItemId(id, DocumentSplitCommon.INTERPRETATION); @@ -691,7 +697,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { String newItemValId = UUID.randomUUID().toString().replace("-", ""); resultMap.put(ID, newItemValId); resultMap.put("create_by", loginUser.getUsername()); - resultMap.put("create_time", format); + resultMap.put(CREATE_TIME, format); resultMap.put("update_by", loginUser.getUsername()); resultMap.put("update_time", format); // 字段名和值 @@ -1034,7 +1040,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { queryWrapper.like(StringUtils.isNotBlank(splitFileInfo.getStandardFileType()), "standard_file_type", splitFileInfo.getStandardFileType()); queryWrapper.likeLeft("file_name", ".docx"); queryWrapper.isNotNull("o.standard_id"); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc(CREATE_TIME); return documentSplitMapper.querySplitFileInfoByPage(queryWrapper, new Page<>(pageNo, pageSize)); } @@ -1214,7 +1220,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 逻辑删除 queryWrapper.eq("del_flag", 0); // 排序 - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc(CREATE_TIME); return queryWrapper; } }