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();