From eaabe3f839c40d1d3fb435b2035ec31662838bf3 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 4 Jan 2024 09:09:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E6=B5=81=E7=A8=8B):=20?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EsInspectFlowServiceImpl.java | 5 ++++ .../impl/ProcessEsInspectServiceImpl.java | 19 ++++++++++++++ .../process/esinspect/vo/EsInspectFlowVO.java | 3 +++ .../esinspect/vo/ProcessEsInspectVO.java | 18 +++++++++++++ .../EsInspectDelayApplyFlowServiceImpl.java | 6 +++++ .../vo/EsInspectDelayApplyFlowVO.java | 3 +++ .../ProcessEsInspectPlanController.java | 2 ++ .../service/IProcessEsInspectPlanService.java | 1 - .../impl/EsInspectPlanFlowServiceImpl.java | 5 ++++ .../impl/ProcessEsInspectPlanServiceImpl.java | 2 ++ .../LawsCustomCompareInfoController.java | 4 +++ .../ILawsCustomCompareInfoService.java | 5 ++++ .../LawsCustomCompareInfoServiceImpl.java | 25 +++++++++++++++++++ .../controller/DocumentSplitController.java | 10 ++++++-- .../service/IDocumentSplitService.java | 6 +++++ .../impl/DocumentSplitServiceImpl.java | 22 ++++++++++++++++ 16 files changed, 133 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index 8be2aae0..55d95656 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -214,6 +214,7 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { enterpriseStandardInspectRectifyPlan.setId(String.valueOf(SnowflakeUtils.snowflake())); enterpriseStandardInspectRectifyPlan.setInspectId(processEsInspect.getId()); } + enterpriseStandardInspectRectifyPlanService.saveOrUpdateBatch(enterpriseStandardInspectRectifyPlanList); } } @@ -344,6 +345,10 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) , false); } + // 业务表数据 + ProcessEsInspectVO processEsInspectVO = new ProcessEsInspectVO(); + processEsInspectVO.setProjectId(projectId); + esInspectFlowVO.setProcessEsInspectVOList(processEsInspectService.queryByList(processEsInspectVO)); esInspectFlowVO.setProcessAll(processAll); esInspectFlowVO.setProcessApprovalRecord(processApprovalRecord); return esInspectFlowVO; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java index 14bf1ff9..c74974c9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java @@ -16,6 +16,9 @@ import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectServ import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; @@ -25,6 +28,7 @@ import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; @@ -184,6 +188,21 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl processEsInspectVOList) { for (ProcessEsInspectVO processEsInspectVO : processEsInspectVOList) { + // 稽查内容 + List enterpriseStandardInspectContents = enterpriseStandardInspectContentService.queryClauseByEsInspectId(processEsInspectVO.getId()); + if (CollectionUtils.isNotEmpty(enterpriseStandardInspectContents)){ + processEsInspectVO.setEnterpriseStandardInspectContentList(enterpriseStandardInspectContents); + } + // 稽查报告 + List enterpriseStandardInspectReports = enterpriseStandardInspectReportService.queryByProcessEsInspectId(processEsInspectVO.getId()); + if (CollectionUtils.isNotEmpty(enterpriseStandardInspectReports)){ + processEsInspectVO.setEnterpriseStandardInspectReportList(enterpriseStandardInspectReports); + } + // 整改计划 + List enterpriseStandardInspectRectifyPlanList = enterpriseStandardInspectRectifyPlanService.queryByProcessEsInspectId(processEsInspectVO.getId()); + if (CollectionUtils.isNotEmpty(enterpriseStandardInspectRectifyPlanList)){ + processEsInspectVO.setEnterpriseStandardInspectRectifyPlanList(enterpriseStandardInspectRectifyPlanList); + } processEsInspectVO.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(processEsInspectVO.getInspectUser(), "")); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java index 49c09741..0c1d2e59 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/EsInspectFlowVO.java @@ -27,6 +27,9 @@ public class EsInspectFlowVO { /**业务基本信息*/ @ApiModelProperty(value = "业务基本信息") private List processEsInspectList; + /**业务基本信息 展示用*/ + @ApiModelProperty(value = "业务基本信息 展示用") + private List processEsInspectVOList; /**map*/ @ApiModelProperty(value = "map") private Map map; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java index de8f84d5..8a04616c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java @@ -1,7 +1,11 @@ package com.jero.modules.activiti.process.esinspect.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectReport; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +13,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +import java.util.List; /** * @ClassName: ProcessEsInspectVO @@ -45,4 +50,17 @@ public class ProcessEsInspectVO extends EnterpriseStandardInspectVo { /** 稽查负责人 翻译*/ @ApiModelProperty(value = "稽查负责人 翻译") private String inspectUserDictText; + + /**稽查内容*/ + @ApiModelProperty(value = "稽查内容") + @TableField(exist = false) + private List enterpriseStandardInspectContentList; + /**稽查报告*/ + @ApiModelProperty(value = "稽查报告") + @TableField(exist = false) + private List enterpriseStandardInspectReportList; + /**整改计划*/ + @ApiModelProperty(value = "整改计划") + @TableField(exist = false) + private List enterpriseStandardInspectRectifyPlanList; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java index e7f9228c..dae85d05 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java @@ -16,6 +16,7 @@ import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsIns import com.jero.modules.activiti.process.esinspectdelayapply.service.IEsInspectDelayApplyFlowService; import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; import com.jero.modules.activiti.process.esinspectdelayapply.vo.EsInspectDelayApplyFlowVO; +import com.jero.modules.activiti.process.esinspectdelayapply.vo.ProcessEsInspectDelayApplyVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; @@ -252,6 +253,11 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF .eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId) , false); } + // 业务表数据 + ProcessEsInspectDelayApplyVO processEsInspectDelayApplyVO = new ProcessEsInspectDelayApplyVO(); + processEsInspectDelayApplyVO.setProjectId(projectId); + processEsInspectDelayApplyVO.setNodeId(processAll.getNodeId()); + esInspectDelayApplyFlowVO.setProcessEsInspectDelayApplyVOList(processEsInspectDelayApplyService.queryByList(processEsInspectDelayApplyVO)); esInspectDelayApplyFlowVO.setProcessAll(processAll); esInspectDelayApplyFlowVO.setProcessApprovalRecord(processApprovalRecord); return esInspectDelayApplyFlowVO; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java index faa14f1a..c4ad04fd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/vo/EsInspectDelayApplyFlowVO.java @@ -27,6 +27,9 @@ public class EsInspectDelayApplyFlowVO { /**业务基本信息*/ @ApiModelProperty(value = "业务基本信息") private List processEsInspectDelayApplyList; + /**业务基本信息 展示用*/ + @ApiModelProperty(value = "业务基本信息 展示用") + private List processEsInspectDelayApplyVOList; /**map*/ @ApiModelProperty(value = "map") private Map map; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java index dee75d50..6952b35a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java @@ -201,6 +201,7 @@ public class ProcessEsInspectPlanController extends JeroController> importExcelByStart(HttpServletRequest request, HttpServletResponse response) throws Exception { return processEsInspectPlanService.importExcelByStart(request, response); } @@ -215,6 +216,7 @@ public class ProcessEsInspectPlanController extends JeroController> importExcelByOpinionFill(HttpServletRequest request, HttpServletResponse response) throws Exception { return processEsInspectPlanService.importExcelByOpinionFill(request, response); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanService.java index ed651bd2..b44427ab 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanService.java @@ -34,7 +34,6 @@ public interface IProcessEsInspectPlanService extends IService queryList(ProcessEsInspectPlan processEsInspectPlan); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index a7eab2d8..d2c5a9df 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -307,6 +307,11 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { } // 会签信息 countersign(taskId, esInspectPlanFlowVO); + // 业务表信息 + ProcessEsInspectPlan processEsInspectPlan = new ProcessEsInspectPlan(); + processEsInspectPlan.setProjectId(projectId); + processEsInspectPlan.setNodeId(processAll.getNodeId()); + esInspectPlanFlowVO.setProcessEsInspectPlanList(processEsInspectPlanService.queryList(processEsInspectPlan)); esInspectPlanFlowVO.setProcessAll(processAll); esInspectPlanFlowVO.setProcessApprovalRecord(processApprovalRecord); return esInspectPlanFlowVO; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java index 6b5287b2..73c81a5b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java @@ -249,6 +249,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl 0){ throw new JeroBootException("文件导入失败:
" + errorMSG); }else { + fillProperty(list); return Result.OK("文件导入成功！数据行数：" + list.size(), list); } } @@ -318,6 +319,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl 0){ throw new JeroBootException("文件导入失败:
" + errorMSG); }else { + fillProperty(list); return Result.OK("文件导入成功！数据行数：" + list.size(), list); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java index 1057b46e..ca369785 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java @@ -223,6 +223,9 @@ public class LawsCustomCompareInfoController { @PostMapping(value = "/save") @RequiresPermissions("customComparison:edit") public Result save(@RequestBody LawsCustomCompareInfo lawsCustomCompareInfo) { + if (StringUtils.isNotBlank(lawsCustomCompareInfo.getId())){ + lawsCustomCompareInfoService.isHorizontalOverstep(lawsCustomCompareInfo.getId()); + } lawsCustomCompareInfoService.saveOrUpdate(lawsCustomCompareInfo); lawsCustomCompareInfoService.editCompareCreateTime(lawsCustomCompareInfo.getId()); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -240,6 +243,7 @@ public class LawsCustomCompareInfoController { if (StringUtils.isBlank(map.getId())) { return Result.error("请选择数据!"); } + lawsCustomCompareInfoService.isHorizontalOverstep(map.getId()); lawsCustomCompareInfoService.delById(map.getId()); lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java index 4ddaa238..7a871fa7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java @@ -113,5 +113,10 @@ public interface ILawsCustomCompareInfoService extends IService roleIds = Arrays.asList(loginUser.getRoleIds().split(",")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", Arrays.asList(ids.split(","))); + if (!roleIds.contains("admin")){ + queryWrapper.and(qw -> + qw.and(qwi -> qwi.eq(IS_SHOW, LawsCustomCompareCommon.IS_SHOW_0) + .eq("create_by", loginUser.getUsername())) + .or().eq(IS_SHOW, LawsCustomCompareCommon.IS_SHOW_1)); + }else { + return; + } + int count = count(queryWrapper); + if (count <= 0){ + if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) { + throw new JeroBootException("无权限!"); + }else{ + throw new JeroBootException("No access!"); + } + } + } + private void createTableCellContent(HSSFSheet sheet, List standardVOS, List featureList, List compareList, List list, CellStyle cellStyle) { for (int i = 2; i <= compareList.size() + 2; i++) { // 创建行 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index cd39224d..12995e7d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -1,14 +1,12 @@ package com.jero.modules.laws.documenttool.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; import com.jero.modules.laws.documenttool.entity.SplitFileInfo; @@ -196,6 +194,7 @@ public class DocumentSplitController { if (StringUtils.isBlank(map.getId())) { return Result.error("请选择数据!"); } + documentSplitService.isHorizontalOverstep(map.getId()); documentSplitService.checkOutOperation(Collections.singletonList(map.getId())); sarFileSplitInfoService.deleteById(map.getId()); @@ -217,6 +216,7 @@ public class DocumentSplitController { return Result.error("请选择数据!"); } List list = Arrays.asList(map.getIds().split(",")); + documentSplitService.isHorizontalOverstep(map.getIds()); documentSplitService.checkOutOperation(list); sarFileSplitInfoService.deleteByIds(list); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); @@ -292,6 +292,7 @@ public class DocumentSplitController { @RequiresPermissions("split:sarFileSplitItems:update") @ApiOperationSupport(order = 14) public Result editDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map parameter) { + documentSplitService.isHorizontalOverstep((String) parameter.get("id")); documentSplitService.editDocumentSplitDetail(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -307,6 +308,7 @@ public class DocumentSplitController { @RequiresPermissions("split:sarFileSplitItems:batchDelete") @ApiOperationSupport(order = 15) public Result editBatchDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map parameter) { + documentSplitService.isHorizontalOverstep((String) parameter.get("ids")); try { documentSplitService.editBatchDocumentSplitDetail(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -327,6 +329,7 @@ public class DocumentSplitController { @RequiresPermissions("split:sarFileSplitItems:delete") @ApiOperationSupport(order = 16) public Result deleteDocumentSplitDetail(@RequestBody Map parameter) { + documentSplitService.isHorizontalOverstep((String) parameter.get("id")); documentSplitService.deleteDocumentSplitDetail(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -341,6 +344,7 @@ public class DocumentSplitController { @PostMapping(value = "/deleteBatchDocumentSplitDetail") @ApiOperationSupport(order = 17) public Result deleteBatchDocumentSplitDetail(@RequestBody Map parameter) { + documentSplitService.isHorizontalOverstep((String) parameter.get("ids")); documentSplitService.deleteBatchDocumentSplitDetail(parameter); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -371,6 +375,7 @@ public class DocumentSplitController { @RequiresPermissions("split:sarFileSplitItems:copy") @ApiOperationSupport(order = 19) public Result copyDocumentSplitDetail(String id) { + documentSplitService.isHorizontalOverstep(id); documentSplitService.copyDocumentSplitDetail(id); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -386,6 +391,7 @@ public class DocumentSplitController { @RequiresPermissions("split:sarFileSplitItems:batchCopy") @ApiOperationSupport(order = 20) public Result copyBatchDocumentSplitDetail(String ids) { + documentSplitService.isHorizontalOverstep(ids); documentSplitService.copyBatchDocumentSplitDetail(ids); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java index 0f627f61..285c0854 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java @@ -200,4 +200,10 @@ public interface IDocumentSplitService { * @return */ List queryTreeMenuByInfoId(String infoId); + + /** + * 文档拆分-是否水平越权 + * @return + */ + void isHorizontalOverstep(String ids); } 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 b20fa959..914ff660 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 @@ -1185,6 +1185,28 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { return new ArrayList<>(); } + @Override + public void isHorizontalOverstep(String ids) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // 发布的只有自己可见，发布的数据所有人可见 + String roleIds = loginUser.getRoleIds(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", Arrays.asList(ids.split(","))); + queryWrapper.and(qw -> + qw.and(qwi -> qwi.eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS1) + .eq("author", loginUser.calcNameWorkNo())) + .or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2) + .or().eq(roleIds.contains("admin"), "author", "云平台")); + int count = lawsDocumentSplitMapper.selectCount(queryWrapper); + if (count <= 0) { + if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) { + throw new JeroBootException("无权限!"); + }else{ + throw new JeroBootException("No access!"); + } + } + } + private void manageData(Map resultMap, StringBuilder fieldsBuilder, StringBuilder valuesBuilder) { // 所有key(字段名) resultMap.forEach((k, v) -> {