diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 59ac7c49..3a7239bf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -224,9 +224,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { if (Objects.isNull(task)) { throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); } - if (!CurrentUserUtil.getId().equals(task.getAssignee())) { - throw new JeroBootException(ResultCommon.NO_PERMISSION); - } + //if (!CurrentUserUtil.getId().equals(task.getAssignee())) { + // throw new JeroBootException(ResultCommon.NO_PERMISSION); + //} } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml index 5ddeb9a9..d0f4ca74 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml @@ -44,7 +44,7 @@ , - ppatu.id termUserId + ppatu.id term_user_id from process_project_assess_term ppat left join process_project_assess_term_user ppatu on ppat.id = ppatu.term_id where ppat.assessment_id = #{assessmentId} @@ -59,7 +59,7 @@ , - ppatu.id termUserId + ppatu.id term_user_id from process_project_assess_term ppat left join process_project_assess_term_user ppatu on ppat.id = ppatu.term_id where ppat.assessment_id = #{assessmentId} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 13a662d3..1c12c3c0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -29,9 +29,11 @@ import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.laws.common.util.CurrentUserUtil; +import org.activiti.engine.HistoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.history.HistoricTaskInstance; import org.activiti.engine.runtime.Execution; import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; @@ -66,6 +68,8 @@ public class ProcessProjectAssessService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); - wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionId); + wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); wrapper.last("limit 1"); ProcessProjectAssessTermUser one = processProjectAssessTermUserService.getOne(wrapper); String responsibleUnitLeader = one.getResponsibleUnitLeader(); @@ -434,7 +439,7 @@ public class ProcessProjectAssessService extends ServiceImpl removeWrapper = new LambdaQueryWrapper<>(); removeWrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); removeWrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId); - removeWrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, executionId); + removeWrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); processProjectAssessTermUserService.remove(removeWrapper); @@ -564,7 +569,7 @@ public class ProcessProjectAssessService extends ServiceImplFlow_0xb4gtd + + + Flow_0xb4gtd Flow_1d18hwv + + + Flow_1d18hwv Flow_07hxwn8 Flow_09f92lr @@ -49,6 +55,9 @@ + + + Flow_09f92lr Flow_1w5wrt4 @@ -92,6 +101,9 @@ + + + Flow_11i64js Flow_0mpm9av diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn index c3ea14af..42a9749a 100644 --- a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn @@ -35,11 +35,17 @@ Flow_0xb4gtd + + + Flow_0xb4gtd Flow_1d18hwv + + + Flow_1d18hwv Flow_07hxwn8 Flow_09f92lr @@ -49,6 +55,9 @@ + + + Flow_09f92lr Flow_1w5wrt4 @@ -92,6 +101,9 @@ + + + Flow_11i64js Flow_0mpm9av