From d235e8612c2bd6bda8ae48d1f070866db1fe33e7 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 27 Dec 2023 17:57:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9D=83=E9=99=90=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2079593?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EsPermissionApplyFlowServiceImpl.java | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java index 913cdf7d..65f5f65a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java @@ -17,13 +17,9 @@ import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermi import com.jero.modules.activiti.process.espermissionapply.service.EsPermissionApplyFlowService; import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; import com.jero.modules.activiti.process.espermissionapply.vo.EsPermissionApplyFlowVO; -import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import org.activiti.engine.ProcessEngine; import org.activiti.engine.ProcessEngines; import org.activiti.engine.RuntimeService; @@ -56,19 +52,16 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe private final ProcessApprovalRecordService processApprovalRecordService; private final ProcessDraftService processDraftService; private final ProcessNodeLinkService processNodeLinkService; - private final EnterpriseStandardAuthUserService enterpriseStandardAuthUserService; private final IProcessEsPermissionApplyService processEsPermissionApplyService; public EsPermissionApplyFlowServiceImpl(ProcessAllService processAllService, ProcessApprovalRecordService processApprovalRecordService, ProcessDraftService processDraftService, ProcessNodeLinkService processNodeLinkService, - EnterpriseStandardAuthUserService enterpriseStandardAuthUserService, IProcessEsPermissionApplyService processEsPermissionApplyService) { this.processAllService = processAllService; this.processApprovalRecordService = processApprovalRecordService; this.processDraftService = processDraftService; this.processNodeLinkService = processNodeLinkService; - this.enterpriseStandardAuthUserService = enterpriseStandardAuthUserService; this.processEsPermissionApplyService = processEsPermissionApplyService; } @@ -274,14 +267,16 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe if (isLastNode(processAll.getProcessInstanceId()) && map.containsKey("pass") && (boolean) map.get("pass")){ // 临时权限设置 - ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(processAll.getProjectId()); - List lawsEnterpriseStandardList = processEsPermissionApplyVO.getLawsEnterpriseStandardList(); - List idList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); - LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission(); - lawsStandardTempPermission.setStandardIds(String.join(",", idList)); - lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId()); - lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate()); - enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission); + /** + * ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(processAll.getProjectId()); + * List lawsEnterpriseStandardList = processEsPermissionApplyVO.getLawsEnterpriseStandardList(); + * List idList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); + * LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission(); + * lawsStandardTempPermission.setStandardIds(String.join(",", idList)); + * lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId()); + * lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate()); + * enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission); + */ } } }