From ed6c0b64a7342c5aeebe23939e34dee30f381486 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Thu, 22 Feb 2024 17:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E3=80=81=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/LawsCustomCompareCellDao.xml | 39 ------------------- .../SarFileCompareInfoController.java | 4 +- .../impl/SarFileCompareInfoServiceImpl.java | 2 +- .../SarFileCompareItemCommentServiceImpl.java | 8 +--- .../SarFileCompareResCommentServiceImpl.java | 4 -- .../controller/DocumentSplitController.java | 4 +- .../impl/DocumentSplitServiceImpl.java | 2 +- .../impl/FileSplitItemsEOServiceImpl.java | 2 +- 8 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 byd-structuredplugins-serve/laws-module-system/src/main/resources/mapper/LawsCustomCompareCellDao.xml diff --git a/byd-structuredplugins-serve/laws-module-system/src/main/resources/mapper/LawsCustomCompareCellDao.xml b/byd-structuredplugins-serve/laws-module-system/src/main/resources/mapper/LawsCustomCompareCellDao.xml deleted file mode 100644 index 96f1974..0000000 --- a/byd-structuredplugins-serve/laws-module-system/src/main/resources/mapper/LawsCustomCompareCellDao.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - insert into laws-sinotruk-demo.laws_custom_compare_cell(id, info_id, standard_id, feature_id, compare_item_id, content, file_id, create_by, create_time, update_by, update_time, del_flag) - values - - (#{entity.id}, #{entity.infoId}, #{entity.standardId}, #{entity.featureId}, #{entity.compareItemId}, #{entity.content}, #{entity.fileId}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.delFlag}) - - - - - insert into laws-sinotruk-demo.laws_custom_compare_cell(id, info_id, standard_id, feature_id, compare_item_id, content, file_id, create_by, create_time, update_by, update_time, del_flag) - values - - (#{entity.id}, #{entity.infoId}, #{entity.standardId}, #{entity.featureId}, #{entity.compareItemId}, #{entity.content}, #{entity.fileId}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.delFlag}) - - on duplicate key update - id = values(id) , info_id = values(info_id) , standard_id = values(standard_id) , feature_id = values(feature_id) , compare_item_id = values(compare_item_id) , content = values(content) , file_id = values(file_id) , create_by = values(create_by) , create_time = values(create_time) , update_by = values(update_by) , update_time = values(update_time) , del_flag = values(del_flag) - - - diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 85b2afc..d217612 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -162,8 +162,8 @@ public class SarFileCompareInfoController extends JeroController delete(@RequestBody IdMapBody mapBody) { - // 水平越权 - sarFileCompareInfoService.isHorizontalOverstep(mapBody.getId()); +// // 水平越权 +// sarFileCompareInfoService.isHorizontalOverstep(mapBody.getId()); sarFileCompareInfoService.deleteById(mapBody.getId()); return Result.OK("删除成功!"); } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index ccf2a65..b2c6eb8 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -295,7 +295,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl list = null; if (includeComments && MyStringUtils.isEmpty(selectIds)) { //只导出全文评论的情况 diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java index de1450e..fabf64e 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java @@ -40,8 +40,6 @@ public class SarFileCompareResCommentServiceImpl extends ServiceImpl queryListByInfoId(String id, String str) { - // 水平越权九 - sarFileCompareInfoService.isHorizontalOverstep(id); if (MyStringUtils.isBlank(str)) { return queryListByInfoId(id); } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java index 363edaf..a441957 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java @@ -186,8 +186,8 @@ public class DocumentSplitController { if (StringUtils.isBlank(map.getId())) { return Result.error("请选择数据!"); } - documentSplitService.isHorizontalOverstep(map.getId()); - documentSplitService.checkOutOperation(Collections.singletonList(map.getId())); +// documentSplitService.isHorizontalOverstep(map.getId()); +// documentSplitService.checkOutOperation(Collections.singletonList(map.getId())); sarFileSplitInfoService.deleteById(map.getId()); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED)); } 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 8dac2d5..3654330 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 @@ -1198,7 +1198,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { String infoId = UUID.randomUUID().toString().replace("-", ""); sarFileSplitInfoEO.setId(infoId); sarFileSplitInfoEO.setSplitResult("成功"); - sarFileSplitInfoEO.setSplitStatus(SplitEnum.SPLIT_STATUS1.getValue()); + sarFileSplitInfoEO.setSplitStatus(SplitEnum.SPLIT_STATUS2.getValue()); sarFileSplitInfoEO.setAuthor(userId); sarFileSplitInfoEO.setCreateTime(now); sarFileSplitInfoEO.setUpdateTime(now); diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index b802fdf..d2c327b 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1694,7 +1694,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl