|
@ -549,7 +549,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
if(sysUserVoResultBean.getData()!=null){ |
|
|
if(sysUserVoResultBean.getData()!=null){ |
|
|
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); |
|
|
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); |
|
|
flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); |
|
|
flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); |
|
|
String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath",""); |
|
|
/*String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath",""); |
|
|
String ogrName=""; |
|
|
String ogrName=""; |
|
|
if(StringUtils.isNotBlank(createOrgPath)){ |
|
|
if(StringUtils.isNotBlank(createOrgPath)){ |
|
|
List<String> stringList = Arrays.asList(createOrgPath.split("/")); |
|
|
List<String> stringList = Arrays.asList(createOrgPath.split("/")); |
|
@ -567,7 +567,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
} |
|
|
} |
|
|
}else{ |
|
|
}else{ |
|
|
flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName()); |
|
|
flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName()); |
|
|
} |
|
|
}*/ |
|
|
} |
|
|
} |
|
|
ResultBean<SysUserVo> sysUserVoResultBean2 = sysUserFeign.fetchBySid(userSid); |
|
|
ResultBean<SysUserVo> sysUserVoResultBean2 = sysUserFeign.fetchBySid(userSid); |
|
|
flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName()); |
|
|
flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName()); |
|
@ -782,7 +782,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
flowTask.setEndTime(new Date(end_time_t_l)); |
|
|
flowTask.setEndTime(new Date(end_time_t_l)); |
|
|
} |
|
|
} |
|
|
flowTask.setProcessVariables(historicTaskInstance.getProcessVariables()); |
|
|
flowTask.setProcessVariables(historicTaskInstance.getProcessVariables()); |
|
|
String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath",""); |
|
|
/* String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath",""); |
|
|
String ogrName=""; |
|
|
String ogrName=""; |
|
|
if(StringUtils.isNotBlank(createOrgPath)){ |
|
|
if(StringUtils.isNotBlank(createOrgPath)){ |
|
|
List<String> stringList = Arrays.asList(createOrgPath.split("/")); |
|
|
List<String> stringList = Arrays.asList(createOrgPath.split("/")); |
|
@ -811,7 +811,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
}else{ |
|
|
}else{ |
|
|
flowTask.setStartDeptName(""); |
|
|
flowTask.setStartDeptName(""); |
|
|
} |
|
|
} |
|
|
} |
|
|
}*/ |
|
|
hisTaskList.add(flowTask); |
|
|
hisTaskList.add(flowTask); |
|
|
} |
|
|
} |
|
|
page.setTotal(count); |
|
|
page.setTotal(count); |
|
|