ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(权限申请流程): 79593

Browse Source
This commit is contained in:
yjz
2023-12-27 17:57:03 +08:00
parent dc749e54e0
commit d235e8612c
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
+10 -15
View File
@@ -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.EsPermissionApplyFlowService;
import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; 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.EsPermissionApplyFlowVO;
import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.activiti.service.ProcessNodeLinkService; 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.ProcessEngine;
import org.activiti.engine.ProcessEngines; import org.activiti.engine.ProcessEngines;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
@@ -56,19 +52,16 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
private final ProcessApprovalRecordService processApprovalRecordService; private final ProcessApprovalRecordService processApprovalRecordService;
private final ProcessDraftService processDraftService; private final ProcessDraftService processDraftService;
private final ProcessNodeLinkService processNodeLinkService; private final ProcessNodeLinkService processNodeLinkService;
private final EnterpriseStandardAuthUserService enterpriseStandardAuthUserService;
private final IProcessEsPermissionApplyService processEsPermissionApplyService; private final IProcessEsPermissionApplyService processEsPermissionApplyService;
public EsPermissionApplyFlowServiceImpl(ProcessAllService processAllService, public EsPermissionApplyFlowServiceImpl(ProcessAllService processAllService,
ProcessApprovalRecordService processApprovalRecordService, ProcessApprovalRecordService processApprovalRecordService,
ProcessDraftService processDraftService, ProcessDraftService processDraftService,
ProcessNodeLinkService processNodeLinkService, ProcessNodeLinkService processNodeLinkService,
EnterpriseStandardAuthUserService enterpriseStandardAuthUserService,
IProcessEsPermissionApplyService processEsPermissionApplyService) { IProcessEsPermissionApplyService processEsPermissionApplyService) {
this.processAllService = processAllService; this.processAllService = processAllService;
this.processApprovalRecordService = processApprovalRecordService; this.processApprovalRecordService = processApprovalRecordService;
this.processDraftService = processDraftService; this.processDraftService = processDraftService;
this.processNodeLinkService = processNodeLinkService; this.processNodeLinkService = processNodeLinkService;
this.enterpriseStandardAuthUserService = enterpriseStandardAuthUserService;
this.processEsPermissionApplyService = processEsPermissionApplyService; this.processEsPermissionApplyService = processEsPermissionApplyService;
} }
@@ -274,14 +267,16 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
if (isLastNode(processAll.getProcessInstanceId()) if (isLastNode(processAll.getProcessInstanceId())
&& map.containsKey("pass") && (boolean) map.get("pass")){ && map.containsKey("pass") && (boolean) map.get("pass")){
// 临时权限设置 // 临时权限设置
ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(processAll.getProjectId()); /**
List<LawsEnterpriseStandard> lawsEnterpriseStandardList = processEsPermissionApplyVO.getLawsEnterpriseStandardList(); * ProcessEsPermissionApplyVO processEsPermissionApplyVO = processEsPermissionApplyService.queryByProjectId(processAll.getProjectId());
List<String> idList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList()); * List<LawsEnterpriseStandard> lawsEnterpriseStandardList = processEsPermissionApplyVO.getLawsEnterpriseStandardList();
LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission(); * List<String> idList = lawsEnterpriseStandardList.stream().map(LawsEnterpriseStandard::getId).collect(Collectors.toList());
lawsStandardTempPermission.setStandardIds(String.join(",", idList)); * LawsStandardTempPermission lawsStandardTempPermission = new LawsStandardTempPermission();
lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId()); * lawsStandardTempPermission.setStandardIds(String.join(",", idList));
lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate()); * lawsStandardTempPermission.setUserIds(processEsPermissionApplyVO.getUserId());
enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission); * lawsStandardTempPermission.setAuthDate(processEsPermissionApplyVO.getExpirationDate());
* enterpriseStandardAuthUserService.saveTempPermissionTwo(lawsStandardTempPermission);
*/
} }
} }
} }