|
@@ -1078,7 +1078,8 @@ public class ActivitiServiceImpl implements ActivitiService {
|
|
sopRoleTypeCompositeEnum = SopRoleTypeCompositeEnum.REGION_MANAGER;
|
|
sopRoleTypeCompositeEnum = SopRoleTypeCompositeEnum.REGION_MANAGER;
|
|
TFFlowLog tfFlowLog = tfFlowLogService.findByLastFlowLog(flowId,
|
|
TFFlowLog tfFlowLog = tfFlowLogService.findByLastFlowLog(flowId,
|
|
FlowApproveOperationEnum.APPROVE);
|
|
FlowApproveOperationEnum.APPROVE);
|
|
- if (tfFlowLog.getApproveSetup().intValue() == 3 && Objects.nonNull(
|
|
|
|
|
|
+ if (tfFlowLog.getApproveId().longValue() == sysUser.getId().longValue()
|
|
|
|
+ && tfFlowLog.getApproveSetup().intValue() == 3 && Objects.nonNull(
|
|
tfFlowLog.getApproveRemark())) {
|
|
tfFlowLog.getApproveRemark())) {
|
|
sopRoleTypeCompositeEnum = SopRoleTypeCompositeEnum.PROJECT_MANAGER;
|
|
sopRoleTypeCompositeEnum = SopRoleTypeCompositeEnum.PROJECT_MANAGER;
|
|
}
|
|
}
|