From 1bbce46b093827eb14ede0dd8c46317a9835e34a Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 29 Dec 2023 16:43:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=A8=BD=E6=9F=A5=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2079732?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EsInspectRectifyFlowServiceImpl.java | 2 ++ .../impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java index 33e47680..0e454887 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java @@ -109,6 +109,7 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer .singleResult(); // 更新流程审批信息 + processApprovalRecord.setUserId((String) map.get("responsible")); processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setFinishFlag(FinishFlagEnum.INCOMPLETE.getValue()); processApprovalRecord.setEndTime(new Date()); @@ -239,6 +240,7 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer for (UserInfo userInfo : userInfoList) { processNodeLinkService.update(new LambdaUpdateWrapper() .eq(ProcessNodeLink::getProcessNodeId, userInfo.getId()) + .eq(ProcessNodeLink::getProcessInstanceId, processAll.getProcessInstanceId()) .set(ProcessNodeLink::getUserId, userInfo.getLinkUserIds())); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java index b9e3a8db..680c1437 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java @@ -173,7 +173,7 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl EnterpriseStandardInspectReport enterpriseStandardInspectReport = EnterpriseStandardInspectReportService.getById(item.getInspectReportId()); // 稽查内容查询 EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); - enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo()); + enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause()); enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); item.setEnterpriseStandardInspectReport(enterpriseStandardInspectReport); // 翻译