wangliang hai 9 meses
pai
achega
2c5886c7cd

+ 2 - 1
sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

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