|
|
@@ -759,12 +759,12 @@ public class FlowMainService implements BaseService<FlowMain, FlowMainExample> {
|
|
|
newflowMainPush.setPushUser(task.getAssignee());//推送人id'
|
|
|
newflowMainPush.setPushUserKey(pushUserKey);//推送时彭总给的key值
|
|
|
{
|
|
|
- //找到上个流程节点将数据放进去 (这里还是有漏洞,就是多次返回上个节点会有问题)
|
|
|
+ //找到上个流程节点将数据放进去
|
|
|
// newflowMainPush.setNodeName(myUserTask.getName());
|
|
|
- FlowMainLog upflowMainLog = flowMainLogService.selectByPrimaryKey(flowMainPush.getUpMainLogId());
|
|
|
- newflowMainPush.setNodeUserRole(upflowMainLog.getPushUserKey());
|
|
|
- newflowMainPush.setNodeName(upflowMainLog.getNodeName());
|
|
|
|
|
|
+ String currRole = proActiService.getCurrRole(targetUser, flowMain);
|
|
|
+ newflowMainPush.setNodeUserRole(currRole);
|
|
|
+ newflowMainPush.setNodeName(ConstantFlowType.nodeKeys_Name.get(currRole));
|
|
|
|
|
|
}
|
|
|
newflowMainPush.setPushType(pushType);//推送类型1单流程推送,2串联推送,3并联推送
|
|
|
@@ -1935,7 +1935,7 @@ public class FlowMainService implements BaseService<FlowMain, FlowMainExample> {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- //判断目标人是否存在,如果存在,再判断该节点是否是串联或串联审核,如果只是单流程就进行查询目标人是否有更高级别角色
|
|
|
+ //(前提,不是查部门直接领导或者部门领导而是查角色flow)判断目标人是否存在,如果存在,再判断该节点是否是串联或串联审核,如果只是单流程就进行查询目标人是否有更高级别角色
|
|
|
public String findUpRoleIfExist(FlowMain flowMain, FrameUser targetUser, String roleType) {
|
|
|
String[] roleTypeArray = roleType.split("_");
|
|
|
String key_e = roleTypeArray[roleTypeArray.length - 1];
|
|
|
@@ -1955,4 +1955,6 @@ public class FlowMainService implements BaseService<FlowMain, FlowMainExample> {
|
|
|
return roleType;
|
|
|
// }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|
