From 9449d06f41fa349aa963fa790750982fac359b17 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 11 Dec 2023 09:11:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E6=95=B4=E6=94=B9):=20=E7=94=9F=E6=88=90=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=B6=88=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EsInspectFlowServiceImpl.java | 4 ++-- .../activiti/service/ProcessNodeLinkService.java | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index 19c797eb..c30244d8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -405,8 +405,8 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { // 处理人员信息 Map map = new HashMap<>(); map.put("responsible", enterpriseStandardInspectRectifyPlan.getResponseUser()); - map.put("leader", ""); - map.put("responsibleApproval", ""); + map.put("leader", "请选择"); + map.put("responsibleApproval", "请选择"); esInspectReportFlowVO.setMap(map); esInspectReportFlowService.createReportFlow(esInspectReportFlowVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeLinkService.java index a9494da6..4f4b938f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeLinkService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeLinkService.java @@ -2,16 +2,13 @@ package com.jero.modules.activiti.service; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.jero.modules.activiti.entity.ProcessNode; -import com.jero.modules.activiti.enums.VariableTypeEnum; -import org.activiti.engine.RepositoryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.mapper.ProcessNodeLinkMapper; +import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.entity.ProcessNodeLink; +import com.jero.modules.activiti.enums.VariableTypeEnum; +import com.jero.modules.activiti.mapper.ProcessNodeLinkMapper; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -55,6 +52,7 @@ public class ProcessNodeLinkService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(ProcessNodeLink::getProcessNodeId,processNodeId); + wrapper1.eq(ProcessNodeLink::getProcessInstanceId,processInstanceId); this.remove(wrapper1); for (String userId : userIdList) { ProcessNodeLink processNodeLink = new ProcessNodeLink();