fix(稽查整改流程): 79732

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<ProcessNodeLink>()
                     .eq(ProcessNodeLink::getProcessNodeId, userInfo.getId())
+                    .eq(ProcessNodeLink::getProcessInstanceId, processAll.getProcessInstanceId())
                     .set(ProcessNodeLink::getUserId, userInfo.getLinkUserIds()));
         }
 

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);
             // 翻译