|
@@ -898,8 +898,13 @@ public class TaskController extends BladeController {
|
|
|
currentParallelId = parallel.getId();
|
|
|
break;
|
|
|
}
|
|
|
- if (parallel.getStatus() != 2) {
|
|
|
- name.add(parallel.getTaskUserName());
|
|
|
+ //判断是否是流程审批
|
|
|
+ String sql="select COALESCE(fixed_flow_link_type, 0) from u_fixed_flow_link where fixed_flow_id="+task.getFixedFlowId()+" and fixed_flow_link_user="+parallel.getTaskUser()+" limit 1";
|
|
|
+ Integer fixedFlowLinkType = jdbcTemplate.queryForObject(sql,Integer.class);
|
|
|
+ if(fixedFlowLinkType==1){
|
|
|
+ if (parallel.getStatus() != 2) {
|
|
|
+ name.add(parallel.getTaskUserName());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (name.size() > 0) {
|