diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java index 401a7610..72efa190 100644 --- a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java +++ b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java @@ -224,7 +224,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic mainData.add(md); } - ParamData paramData = new ParamData(data.getSite(), baseData.get("controlAccount"), nodeDetails.get(0).getNodeId(), + ParamData paramData = new ParamData(data.getSite(), baseData.get("domainControlAccount"), nodeDetails.get(0).getNodeId(), data.getApplyNo(), data.getUserName(), baseData.get("classificationNo"), nodeDetails.get(0).getStepId(), baseData.get("menuId"), baseData.get("userId"), baseData.get("workflowId"), baseData.get("workflowname"), baseData.get("requestName"), mainData, baseData.get("path"), "", "plm_project_tool_applyHeader", "apply_no"); @@ -234,7 +234,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic data.setStatusCode("15"); data.setStatus("审批中"); } catch (Exception e) { - changeManagementService.rollBackFunction(paramData); + changeManagementService.rollBackFunction(paramData, e); throw new RuntimeException(e.getMessage()); } diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index db38fef6..c4bc38f9 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -1054,7 +1054,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl